From 68f0f030ec691db45c9bf2b5ca525adab2d5431f Mon Sep 17 00:00:00 2001 From: Michael Still Date: Sat, 23 May 2015 04:02:17 +1000 Subject: [PATCH] Use the correct upstream repos. github.com's repos are a mirror of the openstack.org primary repos. We should use the openstack.org ones. Change-Id: Id2bae517c7972b8553b63b92dccffa8d32231f3f --- .../repo_packages/openstack_clients.yml | 32 +++++++++---------- .../repo_packages/openstack_other.yml | 6 ++-- .../repo_packages/openstack_services.yml | 24 +++++++------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/playbooks/defaults/repo_packages/openstack_clients.yml b/playbooks/defaults/repo_packages/openstack_clients.yml index ca958aeb5d..57b94c77d0 100644 --- a/playbooks/defaults/repo_packages/openstack_clients.yml +++ b/playbooks/defaults/repo_packages/openstack_clients.yml @@ -25,96 +25,96 @@ ## package should be one long name with no additional `_` separating it. ## Barbican client -barbicanclient_git_repo: https://github.com/openstack/python-barbicanclient +barbicanclient_git_repo: https://git.openstack.org/openstack/python-barbicanclient barbicanclient_git_install_branch: 2f9dc5eb0d5124df41620c6f34202219687f5583 # HEAD of "master" as of 22.06.2015 barbicanclient_git_dest: "/opt/barbicanclient_{{ barbicanclient_git_install_branch | replace('/', '_') }}" ## Ceilometer client -ceilometerclient_git_repo: https://github.com/openstack/python-ceilometerclient +ceilometerclient_git_repo: https://git.openstack.org/openstack/python-ceilometerclient ceilometerclient_git_install_branch: 7e4d2edc970a555b982d7081a95c6a1ada6d58de # HEAD of "master" as of 22.06.2015 ceilometerclient_git_dest: "/opt/ceilometerclient_{{ ceilometerclient_git_install_branch | replace('/', '_') }}" ## Cinder client -cinderclient_git_repo: https://github.com/openstack/python-cinderclient +cinderclient_git_repo: https://git.openstack.org/openstack/python-cinderclient cinderclient_git_install_branch: f32684747f39d6723f990ee3171e507466066e36 # HEAD of "master" as of 22.06.2015 cinderclient_git_dest: "/opt/cinderclient_{{ cinderclient_git_install_branch | replace('/', '_') }}" ## Designate client -designateclient_git_repo: https://github.com/openstack/python-designateclient +designateclient_git_repo: https://git.openstack.org/openstack/python-designateclient designateclient_git_install_branch: b57328dc8f7346152464e18b0210dd1d44abc6f3 # HEAD of "master" as of 22.06.2015 designateclient_git_dest: "/opt/designateclient_{{ designateclient_git_install_branch | replace('/', '_') }}" ## Glance client -glanceclient_git_repo: https://github.com/openstack/python-glanceclient +glanceclient_git_repo: https://git.openstack.org/openstack/python-glanceclient glanceclient_git_install_branch: cc38f51086b930a05c0abecf6c9e00fdf5c294f6 # HEAD of "master" as of 22.06.2015 glanceclient_git_dest: "/opt/glanceclient_{{ glanceclient_git_install_branch | replace('/', '_') }}" ## Heat client -heatclient_git_repo: https://github.com/openstack/python-heatclient +heatclient_git_repo: https://git.openstack.org/openstack/python-heatclient heatclient_git_install_branch: 4b193e11712847e9b5a80a507124f5d22749ae8d # HEAD of "master" as of 22.06.2015 heatclient_git_dest: "/opt/heatclient_{{ heatclient_git_install_branch | replace('/', '_') }}" # Ironic client -ironicclient_git_repo: https://github.com/openstack/python-ironicclient +ironicclient_git_repo: https://git.openstack.org/openstack/python-ironicclient ironicclient_git_install_branch: 3f4671a0b7eb5c300291c2e92082d16b96e6316c # HEAD of "master" as of 22.06.2015 ironicclient_git_dest: "/opt/ironicclient_{{ ironicclient_git_install_branch | replace('/', '_') }}" # Keystone client -keystoneclient_git_repo: https://github.com/openstack/python-keystoneclient +keystoneclient_git_repo: https://git.openstack.org/openstack/python-keystoneclient keystoneclient_git_install_branch: d238cc9af4927d1092de207db978536d712af129 # HEAD of "master" as of 22.06.2015 keystoneclient_git_dest: "/opt/keystoneclient_{{ keystoneclient_git_install_branch | replace('/', '_') }}" ## Neutron client -neutronclient_git_repo: https://github.com/openstack/python-neutronclient +neutronclient_git_repo: https://git.openstack.org/openstack/python-neutronclient neutronclient_git_install_branch: dcb7401a04c96aeb7c00a456b1ba0c77134a0a25 # HEAD of "master" as of 22.06.2015 neutronclient_git_dest: "/opt/neutronclient_{{ neutronclient_git_install_branch | replace('/', '_') }}" ## Nova client -novaclient_git_repo: https://github.com/openstack/python-novaclient +novaclient_git_repo: https://git.openstack.org/openstack/python-novaclient novaclient_git_install_branch: 3c2ff0faad8c84777ffe7d9946a1bc4486116084 # HEAD of "master" as of 22.06.2015 novaclient_git_dest: "/opt/novaclient_{{ novaclient_git_install_branch | replace('/', '_') }}" ## OpenStack client -openstackclient_git_repo: https://github.com/openstack/python-openstackclient +openstackclient_git_repo: https://git.openstack.org/openstack/python-openstackclient openstackclient_git_install_branch: 2d6bc8f4c38dbf997e3e71119f13f0328b4a8669 # HEAD of "master" as of 22.06.2015 openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_git_install_branch | replace('/', '_') }}" ## Sahara client -saharaclient_git_repo: https://github.com/openstack/python-saharaclient +saharaclient_git_repo: https://git.openstack.org/openstack/python-saharaclient saharaclient_git_install_branch: 7eeac47d6cb7f2a734894004f62f6b6b91264597 # HEAD of "master" as of 22.06.2015 saharaclient_git_dest: "/opt/saharaclient_{{ saharaclient_git_install_branch | replace('/', '_') }}" ## Swift client -swiftclient_git_repo: https://github.com/openstack/python-swiftclient +swiftclient_git_repo: https://git.openstack.org/openstack/python-swiftclient swiftclient_git_install_branch: 7c716997a8ede3f98741709b0594340df9849a76 # HEAD of "master" as of 22.06.2015 swiftclient_git_dest: "/opt/swiftclient_{{ swiftclient_git_install_branch | replace('/', '_') }}" ## Trove client -troveclient_git_repo: https://github.com/openstack/python-troveclient +troveclient_git_repo: https://git.openstack.org/openstack/python-troveclient troveclient_git_install_branch: cdbf0f3071785dbe8f83b658748327f8b04a6c12 # HEAD of "master" as of 22.06.2015 troveclient_git_dest: "/opt/troveclient_{{ troveclient_git_install_branch | replace('/', '_') }}" ## Tuskar client -tuskarclient_git_repo: https://github.com/openstack/python-tuskarclient +tuskarclient_git_repo: https://git.openstack.org/openstack/python-tuskarclient tuskarclient_git_install_branch: 6fa19d5d106a353188cbccd286a710d1ada4d1d8 # HEAD of "master" as of 22.06.2015 tuskarclient_git_dest: "/opt/tuskarclient_{{ tuskarclient_git_install_branch | replace('/', '_') }}" ## Zaqar client -zaqarclient_git_repo: https://github.com/openstack/python-zaqarclient +zaqarclient_git_repo: https://git.openstack.org/openstack/python-zaqarclient zaqarclient_git_install_branch: 09de9ee38127c4cea67553881fa71991df4d9e37 # HEAD of "master" as of 22.06.2015 zaqarclient_git_dest: "/opt/zaqarclient_{{ zaqarclient_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index f5802bd01d..72b9b19c67 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -25,19 +25,19 @@ ## package should be one long name with no additional `_` separating it. ## Glance store library -glancestore_git_repo: https://github.com/openstack/glance_store +glancestore_git_repo: https://git.openstack.org/openstack/glance_store glancestore_git_install_branch: 0ae8f4102e7aeebb75fe5f65c02ed9bfa76cebb5 # HEAD of "master" as of 22.06.2015 glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}" ## Global Requirements -requirements_git_repo: https://github.com/openstack/requirements +requirements_git_repo: https://git.openstack.org/openstack/requirements requirements_git_install_branch: 6100411c312cfa63526f5dada31318d7f2a605ad # HEAD of "master" as of 22.06.2015 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Tempest Library -tempestlib_git_repo: https://github.com/openstack/tempest-lib +tempestlib_git_repo: https://git.openstack.org/openstack/tempest-lib tempestlib_git_install_branch: 061a2efc71ccce9024f86517edccdb4c82d416bc # HEAD of "master" as of 22.06.2015 tempestlib_git_install_fragments: "yaprtignorerequirements=true" tempestlib_git_dest: "/opt/tempest-lib_{{ requirements_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 4ea5ac1240..d24b2f3938 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -29,67 +29,67 @@ ### or have a comment / reason attached to them as to why a tag can not work. ## Cinder service -cinder_git_repo: https://github.com/openstack/cinder +cinder_git_repo: https://git.openstack.org/openstack/cinder cinder_git_install_branch: 648d544621ed101e6f5581a201efea585a08935a # HEAD of "master" as of 22.06.2015 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service -glance_git_repo: https://github.com/openstack/glance +glance_git_repo: https://git.openstack.org/openstack/glance glance_git_install_branch: 33fb88108b90e7841e5ac12054214ab229dacd2d # HEAD of "master" as of 22.06.2015 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Heat service -heat_git_repo: https://github.com/openstack/heat +heat_git_repo: https://git.openstack.org/openstack/heat heat_git_install_branch: c512e0fb878ecd519fac19df5d35fb8d83590c92 # HEAD of "master" as of 22.06.2015 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service -horizon_git_repo: https://github.com/openstack/horizon +horizon_git_repo: https://git.openstack.org/openstack/horizon horizon_git_install_branch: 6b18a22b51aa991ed1bf45871b98e5a20362778b # HEAD of "master" as of 22.06.2015 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" ## Keystone service -keystone_git_repo: https://github.com/openstack/keystone +keystone_git_repo: https://git.openstack.org/openstack/keystone keystone_git_install_branch: a7ca13b687dd284f0980d768b11a3d1b52b4106e # HEAD of "master" as of 22.06.2015 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service -neutron_git_repo: https://github.com/openstack/neutron +neutron_git_repo: https://git.openstack.org/openstack/neutron neutron_git_install_branch: 3c6ab9e360e6f29b844e53304d0300714b1d52f9 # HEAD of "master" as of 22.06.2015 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" -neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas +neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas neutron_lbaas_git_install_branch: d7bbbf4ce85e923e167ab06004f8cf51055f87ba # HEAD of "master" as of 22.06.2015 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" -neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas +neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas neutron_vpnaas_git_install_branch: f8b7d3168b03efd0fe4fd81f22a98763bae60890 # HEAD of "master" as of 22.06.2015 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" -neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas +neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas neutron_fwaas_git_install_branch: b1853c01264cef9893cc86192f198f6ab62f4ecd # HEAD of "master" as of 22.06.2015 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" ## Nova service -nova_git_repo: https://github.com/openstack/nova +nova_git_repo: https://git.openstack.org/openstack/nova nova_git_install_branch: a4f4be370be06cfc9aa3ed30d2445277e832376f # HEAD of "master" as of 22.06.2015 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## Swift service -swift_git_repo: https://github.com/openstack/swift +swift_git_repo: https://git.openstack.org/openstack/swift swift_git_install_branch: 0009a43eb45fdee6716d1272b346cfc76d946e4b # HEAD of "master" as of 22.06.2015 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" ## Tempest service -tempest_git_repo: https://github.com/openstack/tempest +tempest_git_repo: https://git.openstack.org/openstack/tempest tempest_git_install_branch: 1cfa1720e8db3966af7ad042b6fbb12e01e2ab31 # HEAD of "master" as of 22.06.2015 tempest_git_install_fragments: "yaprtignorerequirements=true" tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"