From b3def9dd0e6aebec09b04d34b13ac98e80334f98 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 27 Jul 2016 09:41:46 +0100 Subject: [PATCH] Update all SHAs for Newton 2016-07-27 This patch updates all the roles to the latest available SHA's, updates all the OpenStack Service SHA's and also updates the appropriate python requirements pins. Change-Id: Ia3e31d5dbbfa0f3ae9522652406421dbce6550b9 --- global-requirement-pins.txt | 2 +- .../repo_packages/openstack_other.yml | 6 ++-- .../repo_packages/openstack_services.yml | 36 +++++++++---------- playbooks/inventory/group_vars/all.yml | 2 +- scripts/scripts-library.sh | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index 384c1b91de..be7c24e08c 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -10,5 +10,5 @@ ### These pins are updated through the sources-branch-updater script ### ### pip==8.1.2 -setuptools==24.0.3 +setuptools==25.1.0 wheel==0.29.0 diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index ef62d1abc7..fd9812b924 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,17 +27,17 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: e9ae44b574f14ccd44dcd6b8cb8913bcebe35e83 # HEAD of "master" as of 02.06.2016 +tempest_git_install_branch: c9436c4fffe403be3555d1738440355019fffb35 # HEAD of "master" as of 27.07.2016 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" ## NOVNC from source novncproxy_git_repo: https://github.com/kanaka/novnc -novncproxy_git_install_branch: f52105bc88ebd18d5cb3fba817173e99600cdc3f # HEAD of "master" as of 02.06.2016 +novncproxy_git_install_branch: da82b3426c27bf1a79f671c5825d68ab8c0c5d9f # HEAD of "master" as of 27.07.2016 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}" ## spice-html5 from source spicehtml5_git_repo: https://github.com/SPICE/spice-html5 -spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 02.06.2016 +spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 27.07.2016 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index d74a2fbaaf..92c9cacde9 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,99 +31,99 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: b2dce2edd91263de3e2b15c216183a0ede7a7cd4 # HEAD of "master" as of 20.07.2016 +requirements_git_install_branch: 689a99c58057dc52216eac362c8ead58618780ff # HEAD of "master" as of 27.07.2016 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: 06204adac4ec136650e9ae3219649d2b373c945c # HEAD of "master" as of 20.07.2016 +aodh_git_install_branch: 06204adac4ec136650e9ae3219649d2b373c945c # HEAD of "master" as of 27.07.2016 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 79dff805bbc73760cbcbb76f7f2f1c0a4a0753b4 # HEAD of "master" as of 20.07.2016 +ceilometer_git_install_branch: 77b5ff2472027d9f1a7076817b3585b8a20eb60d # HEAD of "master" as of 27.07.2016 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 7aaf4a20224d448cad41d957f37278a77b34294c # HEAD of "master" as of 20.07.2016 +cinder_git_install_branch: c523afa0fdbc6c46270419fbdb71c8bc6103ed52 # HEAD of "master" as of 27.07.2016 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 46a7146e636d9566c27b6f55a0c5d3d6b55c9e61 # HEAD of "master" as of 20.07.2016 +glance_git_install_branch: f36271e110c3500eeb80e743a4a78aac469b1e88 # HEAD of "master" as of 27.07.2016 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Gnocchi service gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi -gnocchi_git_install_branch: d272d072909b73597405ff6006d6cd60e1b3e57e # HEAD of "master" as of 20.07.2016 +gnocchi_git_install_branch: 1d72344fd9a4b0eb1d454ba0a890346e9d7b825c # HEAD of "master" as of 27.07.2016 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}" ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: f930797e0dc33b250cb6cb4ffce6393865c5d59e # HEAD of "master" as of 20.07.2016 +heat_git_install_branch: 072944d91d5358d136c0e42e604e0d469ef8c8fe # HEAD of "master" as of 27.07.2016 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 2e77e1cf99ac46ed2750fc02af573ccfb1941617 # HEAD of "master" as of 20.07.2016 +horizon_git_install_branch: 02043a98cb01dc9050dfaae5a95986b5f31dba84 # HEAD of "master" as of 27.07.2016 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard -neutron_lbaas_dashboard_git_install_branch: 0d25bbd63b2392f07e1f37e3d94119883858d3dd # HEAD of "master" as of 20.07.2016 +neutron_lbaas_dashboard_git_install_branch: 0d25bbd63b2392f07e1f37e3d94119883858d3dd # HEAD of "master" as of 27.07.2016 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}" ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: 38aa65336686205e9ab07fdacb454ace01eca695 # HEAD of "master" as of 20.07.2016 +keystone_git_install_branch: 9d54eb33c1d74ff39c947af6ff984ef2e0bf4be4 # HEAD of "master" as of 27.07.2016 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 122a971656671f92927d44ddd3725cca74b4e0bb # HEAD of "master" as of 20.07.2016 +neutron_git_install_branch: 451193c8509125963af781352d9301e70d4ed956 # HEAD of "master" as of 27.07.2016 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 5831442736456e4200254d12ddc348718039ec9e # HEAD of "master" as of 20.07.2016 +neutron_lbaas_git_install_branch: 9664684aad0435c3f783bc6293a0040f5873db35 # HEAD of "master" as of 27.07.2016 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: b6f8c401c3a50a54071625596c3d4ccd19b8c002 # HEAD of "master" as of 20.07.2016 +neutron_vpnaas_git_install_branch: bd724e60886b7a4eca760d6d53e1be1ec361675c # HEAD of "master" as of 27.07.2016 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 050b9e052f226efd64a4d483ed3201f45a7a101a # HEAD of "master" as of 20.07.2016 +neutron_fwaas_git_install_branch: c3e491cae388713bb175d803de6a216a8816b816 # HEAD of "master" as of 27.07.2016 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: 562a1fe9996189ddd9cc5c47ab070a498cfce258 # HEAD of "master" as of 20.07.2016 +nova_git_install_branch: 55f308c3affb17afea00894060eb81dd2dbf2a32 # HEAD of "master" as of 27.07.2016 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## PowerVM Virt Driver nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm -nova_powervm_git_install_branch: fb4cab4a03dcb0c2357928807e6729b4235439d0 # HEAD of "master" as of 20.07.2016 +nova_powervm_git_install_branch: 4fb42cc58ac7e6f331f974e81c83ea1de2c4b292 # HEAD of "master" as of 27.07.2016 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}" ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: d9b765320d58571b6b123839f8555f95c20a6bbf # HEAD of "master" as of 20.07.2016 +swift_git_install_branch: f978133cfdb2639e679738e1e193ff9986f22231 # HEAD of "master" as of 27.07.2016 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: d91d1e1174f71b14e91aea42a6415cf0f0b44941 # HEAD of "master" as of 20.07.2016 +ironic_git_install_branch: f7bfa3ee73a2f94be28017212b699d07e9c7ad92 # HEAD of "master" as of 27.07.2016 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 6a0f7a6471..ff5ac9dfef 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -26,7 +26,7 @@ ssh_delay: 5 # These pins are updated through the sources-branch-updater script pip_packages: - pip==8.1.2 - - setuptools==24.0.3 + - setuptools==25.1.0 - wheel==0.29.0 pip_links: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 0a8d9b5e6b..245ad663bb 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5} REPORT_DATA=${REPORT_DATA:-""} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-" -e 'gather_facts=False' "} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==24.0.3 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==25.1.0 wheel==0.29.0 '} # The default SSHD configuration has MaxSessions = 10. If a deployer changes # their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We