openstack
/
sahara
Code Issues Proposed changes

Merge "Replace openstack.org git:// URLs with https://"

This commit is contained in:
Zuul 2019-03-25 10:30:27 +00:00 committed by Gerrit Code Review
parent 74897906ba 617be9032c
commit 78901b59d9
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/README.rst
View File

@ -9,14 +9,14 @@
.. sourcecode:: bash .. sourcecode:: bash
[[local|localrc]] [[local|localrc]]
enable_plugin sahara git://git.openstack.org/openstack/sahara enable_plugin sahara https://git.openstack.org/openstack/sahara
enable_plugin heat git://git.openstack.org/openstack/heat enable_plugin heat https://git.openstack.org/openstack/heat
Optionally, a git refspec may be provided as follows: Optionally, a git refspec may be provided as follows:
.. sourcecode:: bash .. sourcecode:: bash
[[local|localrc]] [[local|localrc]]
enable_plugin sahara git://git.openstack.org/openstack/sahara <refspec> enable_plugin sahara https://git.openstack.org/openstack/sahara <refspec>
3. run ``stack.sh`` 3. run ``stack.sh``

8
devstack/upgrade/settings
View File

@ -6,10 +6,10 @@ devstack_localrc base IMAGE_URLS=\
"http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\ "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc base enable_plugin sahara \ devstack_localrc base enable_plugin sahara \
git://git.openstack.org/openstack/sahara \ https://git.openstack.org/openstack/sahara \
stable/rocky stable/rocky
devstack_localrc base enable_plugin heat \ devstack_localrc base enable_plugin heat \
git://git.openstack.org/openstack/heat \ https://git.openstack.org/openstack/heat \
stable/rocky stable/rocky
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
@ -18,8 +18,8 @@ devstack_localrc target IMAGE_URLS=\
"http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\ "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\
http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
devstack_localrc target enable_plugin sahara \ devstack_localrc target enable_plugin sahara \
git://git.openstack.org/openstack/sahara https://git.openstack.org/openstack/sahara
devstack_localrc target enable_plugin heat \ devstack_localrc target enable_plugin heat \
git://git.openstack.org/openstack/heat https://git.openstack.org/openstack/heat
devstack_localrc target LIBS_FROM_GIT=python-saharaclient devstack_localrc target LIBS_FROM_GIT=python-saharaclient
devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"

2
doc/source/contributor/dashboard-dev-environment-guide.rst
View File

@ -17,7 +17,7 @@ to your ``local.conf`` file
.. sourcecode:: bash .. sourcecode:: bash
# Enable sahara-dashboard # Enable sahara-dashboard
enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard enable_plugin sahara-dashboard https://git.openstack.org/openstack/sahara-dashboard
Isolated Dashboard for Sahara Isolated Dashboard for Sahara

2
doc/source/contributor/development-environment.rst
View File

@ -52,7 +52,7 @@ On openSUSE-based distributions (SLES 12, openSUSE, Factory or Tumbleweed):
.. sourcecode:: console .. sourcecode:: console
$ git clone git://git.openstack.org/openstack/sahara.git $ git clone https://git.openstack.org/openstack/sahara.git
$ cd sahara $ cd sahara
3. Generate Sahara sample using tox 3. Generate Sahara sample using tox

8
doc/source/contributor/devstack.rst
View File

@ -97,10 +97,10 @@ and may cause hard to debug problems.
# OFFLINE=True # OFFLINE=True
# Enable sahara # Enable sahara
enable_plugin sahara git://git.openstack.org/openstack/sahara enable_plugin sahara https://git.openstack.org/openstack/sahara
# Enable heat # Enable heat
enable_plugin heat git://git.openstack.org/openstack/heat enable_plugin heat https://git.openstack.org/openstack/heat
In cases where you need to specify a git refspec (branch, tag, or commit hash) In cases where you need to specify a git refspec (branch, tag, or commit hash)
for the sahara in-tree devstack plugin (or sahara repo), it should be for the sahara in-tree devstack plugin (or sahara repo), it should be
@ -108,7 +108,7 @@ appended to the git repo URL as follows:
.. sourcecode:: bash .. sourcecode:: bash
enable_plugin sahara git://git.openstack.org/openstack/sahara <some_git_refspec> enable_plugin sahara https://git.openstack.org/openstack/sahara <some_git_refspec>
3. Sahara can send notifications to Ceilometer, if Ceilometer is enabled. 3. Sahara can send notifications to Ceilometer, if Ceilometer is enabled.
If you want to enable Ceilometer add the following lines to the If you want to enable Ceilometer add the following lines to the
@ -116,7 +116,7 @@ appended to the git repo URL as follows:
.. sourcecode:: bash .. sourcecode:: bash
enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
4. Start DevStack: 4. Start DevStack:

2
playbooks/sahara-grenade/run.yaml
View File

@ -17,7 +17,7 @@
dest: devstack-gate dest: devstack-gate
EOF EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \ https://git.openstack.org \
openstack-infra/devstack-gate openstack-infra/devstack-gate
executable: /bin/bash executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'