From 973a28ef11dcd1043f32858ab1f46c7c9d44708b Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 5 Jun 2015 16:50:59 -0500 Subject: [PATCH] Updated all of master to the latest SHAs This changes updates our releases within master to test out the latest services. Change-Id: I3c06c72f089008ed7590194d0d9d574cb865564b --- .../repo_packages/openstack_clients.yml | 32 +++++++++---------- .../repo_packages/openstack_other.yml | 6 ++-- .../repo_packages/openstack_services.yml | 24 +++++++------- scripts/sources-branch-updater.sh | 4 +-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/playbooks/defaults/repo_packages/openstack_clients.yml b/playbooks/defaults/repo_packages/openstack_clients.yml index 8590c289fe..18a4289172 100644 --- a/playbooks/defaults/repo_packages/openstack_clients.yml +++ b/playbooks/defaults/repo_packages/openstack_clients.yml @@ -26,95 +26,95 @@ ## Barbican client barbicanclient_git_repo: https://github.com/openstack/python-barbicanclient -barbicanclient_git_install_branch: 3.0.2 +barbicanclient_git_install_branch: e3431cd818de996f57528bb2f6127d192a886ec4 # HEAD of "master" as of 08.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_install_branch: 1.0.13 +ceilometerclient_git_install_branch: 662a4642046ff86fefb56e89bfe269ff6b8bf100 # HEAD of "master" as of 08.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_install_branch: 1.2.1 +cinderclient_git_install_branch: 91bf760989a6c992918d6eadb038d7265ea18287 # HEAD of "master" as of 08.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_install_branch: 1.1.1 +designateclient_git_install_branch: 1548cb1af60f25c4a535251caa01089c80a0b416 # HEAD of "master" as of 08.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_install_branch: 0.17.1 +glanceclient_git_install_branch: dfa98ab04c7fb7260b25e92af18caa2a016698c6 # HEAD of "master" as of 08.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_install_branch: 0.5.0 +heatclient_git_install_branch: 296c8c2a73b936ce1cfc205f447ecc6a8183ebd3 # HEAD of "master" as of 08.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_install_branch: 0.4.1 +ironicclient_git_install_branch: 01d2520788a1effb66fa6009fc8c8b4e38aace28 # HEAD of "master" as of 08.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_install_branch: 1.3.1 +keystoneclient_git_install_branch: 7f407488cefd9668b31df6b4050209438675a95f # HEAD of "master" as of 08.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_install_branch: 2.3.11 +neutronclient_git_install_branch: 7eb3241650ad87d2f6ca5aa45b3a2415eafe7207 # HEAD of "master" as of 08.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_install_branch: 2.22.0 +novaclient_git_install_branch: 773eea811df7be3dcb73dc2ae16354b172f442c6 # HEAD of "master" as of 08.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_install_branch: 1.0.2 +openstackclient_git_install_branch: 7cf779004e5e9eab9abee8d8a5bc2db3dfa8bd5d # HEAD of "master" as of 08.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_install_branch: 0.9.0 +saharaclient_git_install_branch: 963d8ce6bbdfa151defe6702c8d0c31300607c03 # HEAD of "master" as of 08.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_install_branch: 2.3.1 +swiftclient_git_install_branch: ec3e2ab3a099b1276ae5d87fda936567f64423dc # HEAD of "master" as of 08.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_install_branch: 1.0.8 +troveclient_git_install_branch: e586689e0890da00f29a474b35a8e3537654b72e # HEAD of "master" as of 08.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_install_branch: 0.1.15 +tuskarclient_git_install_branch: 47fdee09d06d80b523ab6e68fb7ebb93074b4659 # HEAD of "master" as of 08.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_install_branch: 0.1.0 +zaqarclient_git_install_branch: 09de9ee38127c4cea67553881fa71991df4d9e37 # HEAD of "master" as of 08.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 50c83f50ef..1ac3734e41 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -26,17 +26,17 @@ ## Glance store library glancestore_git_repo: https://github.com/openstack/glance_store -glancestore_git_install_branch: e8884d2cb31c3364d353619a8b446ec89da547b8 # HEAD of "master" as of 20.04.2015 +glancestore_git_install_branch: 5277c93e002047d55c521408ee31da1d03825263 # HEAD of "master" as of 08.06.2015 glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}" ## Global Requirements requirements_git_repo: https://github.com/openstack/requirements -requirements_git_install_branch: 7da0b687622932e84a7c7859f4ce474b7062ecd3 # HEAD of "master" as of 23.04.2015 +requirements_git_install_branch: fceaa485414e8872a79b4b3628bc94bcd10e1839 # HEAD of "master" as of 08.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_install_branch: 0.4.0 +tempestlib_git_install_branch: f93048334cf9f93a823dd42387f76ecddf27d30d # HEAD of "master" as of 08.06.2015 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 c1c67bb345..ee56d49b81 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -30,65 +30,65 @@ ## Cinder service cinder_git_repo: https://github.com/openstack/cinder -cinder_git_install_branch: e8d2a6e74bc26040329113daa3798e3dee81a972 # HEAD of "master" as of 12.05.2015 +cinder_git_install_branch: fce961e8c8081b804f25786935e4026a87abf9dd # HEAD of "master" as of 08.06.2015 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service glance_git_repo: https://github.com/openstack/glance -glance_git_install_branch: 4efb56aae9288952bdb0d368a7c307e8524b80d8 # HEAD of "master" as of 12.05.2015 +glance_git_install_branch: be8c464c8e986fc6ca064b42d475c805aac9062d # HEAD of "master" as of 08.06.2015 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Heat service heat_git_repo: https://github.com/openstack/heat -heat_git_install_branch: b02805bea5693346852086bcaa753a1c85ffa71f # HEAD of "master" as of 01.06.2015 +heat_git_install_branch: 8fe06151c1691d2246dcec3e6dcae7c204908df2 # HEAD of "master" as of 08.06.2015 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service horizon_git_repo: https://github.com/openstack/horizon -horizon_git_install_branch: 6f3d61241ac32f61e77562a7813e6fd9813a478c # HEAD of "master" as of 12.05.2015 +horizon_git_install_branch: b11d49891c6c8e8cdbc3a09f538d13596fe10b8e # HEAD of "master" as of 08.06.2015 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" ## Keystone service keystone_git_repo: https://github.com/openstack/keystone -keystone_git_install_branch: 344b4fea7ec3dd703cbcbd080c983759206d13f9 # HEAD of "master" as of 12.05.2015 +keystone_git_install_branch: 7f76f23bccd772df35da63584685584576289255 # HEAD of "master" as of 08.06.2015 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service neutron_git_repo: https://github.com/openstack/neutron -neutron_git_install_branch: 2aa336aeb86b5ba4c2569f43242506813bf60e2d # HEAD of "master" as of 12.05.2015 +neutron_git_install_branch: 692da2b7c70dd57c692a36f7a6d8f55fc1fa2a44 # HEAD of "master" as of 08.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_install_branch: 74825a4b94d968e7ed768e5febe1dc12d5b57586 # HEAD of "master" as of 12.05.2015 +neutron_lbaas_git_install_branch: 397585792ce363a4d894136186a7aa51f39c726b # HEAD of "master" as of 08.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_install_branch: 5400931e658602fdde3dc2ce2e3a8512d22829ae # HEAD of "master" as of 12.05.2015 +neutron_vpnaas_git_install_branch: 17b7f1989a3864cd1d742d58ad9696c21f90563a # HEAD of "master" as of 08.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_install_branch: b3dcd49842d081a61118a7273d0b5dbc92797ff0 # HEAD of "master" as of 12.05.2015 +neutron_fwaas_git_install_branch: 76c2a4e4124b62fec9236927f9122e1f696cc9ce # HEAD of "master" as of 08.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_install_branch: d56dd7d233dfafc9245bc0ad972fbfea9ece916f # HEAD of "master" as of 12.05.2015 +nova_git_install_branch: 770a897179f09546b32763697319d49be1697be1 # HEAD of "master" as of 08.06.2015 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## Swift service swift_git_repo: https://github.com/openstack/swift -swift_git_install_branch: 19fd9d6404f5fbb62abf1e36c559cf02895f90f1 # HEAD of "master" as of 12.05.2015 +swift_git_install_branch: 0cf95b055549fd76aba38ea682ad4cc0a74de7fa # HEAD of "master" as of 08.06.2015 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" ## Tempest service tempest_git_repo: https://github.com/openstack/tempest -tempest_git_install_branch: 8fba8d3f4647bd97ef9949454a58f0c6f1a3cfb1 # HEAD of "master" as of 12.05.2015 +tempest_git_install_branch: 9927d643c7340cc55a351cc8ed159d7dd3ba0c54 # HEAD of "master" as of 08.06.2015 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh index c90beb5e37..adb68c01d7 100755 --- a/scripts/sources-branch-updater.sh +++ b/scripts/sources-branch-updater.sh @@ -18,7 +18,7 @@ # the head of given branch via the SHA. This makes it possible to update # all of the services that we support in an "automated" fashion. -ONLINE_BRANCH=${ONLINE_BRANCH:-"stable/kilo"} +ONLINE_BRANCH=${ONLINE_BRANCH:-"master"} SERVICE_FILE=${SERVICE_FILE:-"playbooks/defaults/repo_packages/openstack_services.yml"} IFS=$'\n' @@ -65,7 +65,7 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE});do # Set the branch entry branch_entry="${branch_sha} # HEAD of \"$ONLINE_BRANCH\" as of $(date +%d.%m.%Y)" # Write the branch entry - sed -i '' "s|${repo_name}_git_install_branch:.*|${repo_name}_git_install_branch: $branch_entry|" ${SERVICE_FILE} + sed -i "s|${repo_name}_git_install_branch:.*|${repo_name}_git_install_branch: $branch_entry|" ${SERVICE_FILE} echo "processed $repo_name @ $branch_entry" fi done