From b5467a2a1f0477f0c221e8e29edc62527afd6849 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Sun, 24 Mar 2019 20:36:26 +0000 Subject: [PATCH] Replace openstack.org git:// URLs with https:// This is a mechanically generated change to replace openstack.org git:// URLs with https:// equivalents. This is in aid of a planned future move of the git hosting infrastructure to a self-hosted instance of gitea (https://gitea.io), which does not support the git wire protocol at this stage. This update should result in no functional change. For more information see the thread at http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html Change-Id: I886b29ba8a1814cf876e70b5b20504a221d32fa1 --- devstack/local.conf.compute | 2 +- devstack/local.conf.controller | 6 +++--- doc/source/configuration/configuring.rst | 2 +- doc/source/contributor/devstack.rst | 2 +- playbooks/legacy/watcher-tempest-base-multinode/run.yaml | 6 +++--- playbooks/legacy/watcherclient-tempest-functional/run.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devstack/local.conf.compute b/devstack/local.conf.compute index 79d0aebcc..ba2088995 100644 --- a/devstack/local.conf.compute +++ b/devstack/local.conf.compute @@ -35,7 +35,7 @@ VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP NOVA_INSTANCES_PATH=/opt/stack/data/instances # Enable the Ceilometer plugin for the compute agent -enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer +enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer disable_service ceilometer-acentral,ceilometer-collector,ceilometer-api LOGFILE=$DEST/logs/stack.sh.log diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller index 9bf4956a9..e9eeec25f 100644 --- a/devstack/local.conf.controller +++ b/devstack/local.conf.controller @@ -25,13 +25,13 @@ MULTI_HOST=1 disable_service n-cpu # Enable the Watcher Dashboard plugin -enable_plugin watcher-dashboard git://git.openstack.org/openstack/watcher-dashboard +enable_plugin watcher-dashboard https://git.openstack.org/openstack/watcher-dashboard # Enable the Watcher plugin -enable_plugin watcher git://git.openstack.org/openstack/watcher +enable_plugin watcher https://git.openstack.org/openstack/watcher # Enable the Ceilometer plugin -enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer +enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer # This is the controller node, so disable the ceilometer compute agent disable_service ceilometer-acompute diff --git a/doc/source/configuration/configuring.rst b/doc/source/configuration/configuring.rst index b31f02e2e..ed86da628 100644 --- a/doc/source/configuration/configuring.rst +++ b/doc/source/configuration/configuring.rst @@ -165,7 +165,7 @@ You can easily generate and update a sample configuration file named :ref:`watcher.conf.sample ` by using these following commands:: - $ git clone git://git.openstack.org/openstack/watcher + $ git clone https://git.openstack.org/openstack/watcher $ cd watcher/ $ tox -e genconfig $ vi etc/watcher/watcher.conf.sample diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst index dbc5e2426..343dfb872 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -19,7 +19,7 @@ model. To enable the Watcher plugin with DevStack, add the following to the `[[local|localrc]]` section of your controller's `local.conf` to enable the Watcher plugin:: - enable_plugin watcher git://git.openstack.org/openstack/watcher + enable_plugin watcher https://git.openstack.org/openstack/watcher For more detailed instructions, see `Detailed DevStack Instructions`_. Check out the `DevStack documentation`_ for more information regarding DevStack. diff --git a/playbooks/legacy/watcher-tempest-base-multinode/run.yaml b/playbooks/legacy/watcher-tempest-base-multinode/run.yaml index ee55e356d..7117cd511 100644 --- a/playbooks/legacy/watcher-tempest-base-multinode/run.yaml +++ b/playbooks/legacy/watcher-tempest-base-multinode/run.yaml @@ -17,7 +17,7 @@ dest: devstack-gate EOF /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 executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' @@ -30,9 +30,9 @@ cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] TEMPEST_PLUGINS='/opt/stack/new/watcher-tempest-plugin' - enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer + enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer # Enable watcher devstack plugin. - enable_plugin watcher git://git.openstack.org/openstack/watcher + enable_plugin watcher https://git.openstack.org/openstack/watcher EOF executable: /bin/bash diff --git a/playbooks/legacy/watcherclient-tempest-functional/run.yaml b/playbooks/legacy/watcherclient-tempest-functional/run.yaml index 783292481..a4aeb88f0 100644 --- a/playbooks/legacy/watcherclient-tempest-functional/run.yaml +++ b/playbooks/legacy/watcherclient-tempest-functional/run.yaml @@ -17,7 +17,7 @@ dest: devstack-gate EOF /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 executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' @@ -29,7 +29,7 @@ set -x cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] - enable_plugin watcher git://git.openstack.org/openstack/watcher + enable_plugin watcher https://git.openstack.org/openstack/watcher EOF executable: /bin/bash