diff options
| author | Ian Wienand <iwienand@redhat.com> | 2019-04-10 00:54:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-10 00:54:19 +0000 |
| commit | 9fed6925c4a2cefde73686ca426eb96b1eb5bcfc (patch) | |
| tree | dbe3266231a7f70cb5493e895e612caf45dbd027 | |
| parent | 1240c5cedac70c06f449a83ccb00bbf23c6884b2 (diff) | |
| parent | 3db537b738fc14b5815c6823ea0f47844d5df759 (diff) | |
| download | heat-9fed6925c4a2cefde73686ca426eb96b1eb5bcfc.tar.gz | |
Merge "Replace openstack.org git:// URLs with https://" into stable/rocky11.0.2
| -rw-r--r-- | playbooks/devstack/functional/run.yaml | 14 | ||||
| -rw-r--r-- | playbooks/devstack/grenade/run.yaml | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index bd2e0c937..3c522ccd0 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/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' @@ -55,12 +55,12 @@ export PROJECTS="openstack/heat-agents $PROJECTS" export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://git.openstack.org/openstack/aodh" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar https://git.openstack.org/openstack/zaqar" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron https://git.openstack.org/openstack/neutron" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://git.openstack.org/openstack/heat" # Enable octavia plugin and services export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia" @@ -93,7 +93,7 @@ if [ "{{ use_amqp1 }}" -eq 1 ] ; then export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 https://git.openstack.org/openstack/devstack-plugin-amqp1" export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" fi diff --git a/playbooks/devstack/grenade/run.yaml b/playbooks/devstack/grenade/run.yaml index 5e9a84894..e0064dfce 100644 --- a/playbooks/devstack/grenade/run.yaml +++ b/playbooks/devstack/grenade/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 heat git://git.openstack.org/openstack/heat + enable_plugin heat https://git.openstack.org/openstack/heat TEMPEST_PLUGINS+=' ../heat-tempest-plugin' EOF executable: /bin/bash |