From e9fa2893fa6532f003bebd3e9c753b5f7dc87fb8 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 2 Dec 2016 10:47:53 +0000 Subject: [PATCH] Update all SHAs for 14.0.4 This patch updates all the roles to the latest available stable SHA's, copies the release notes from the updated roles into the integrated repo, updates all the OpenStack Service SHA's, and updates the appropriate python requirements pins. Depends-On: I908bc9d48f5b001061fa82995f8129412651c3e0 Change-Id: Ib9b1174e6ffc56d2e6d47d61e359548cfca35c5f --- ansible-role-requirements.yml | 14 +++--- global-requirement-pins.txt | 2 +- playbooks/defaults/repo_packages/gnocchi.yml | 2 +- .../repo_packages/openstack_services.yml | 46 +++++++++---------- playbooks/inventory/group_vars/all.yml | 4 +- scripts/scripts-library.sh | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 40715f7e47..5142f2dfd0 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -41,11 +41,11 @@ - name: openstack-ansible-security scm: git src: https://git.openstack.org/openstack/openstack-ansible-security - version: 5e8714cf037fa52d65ca179f3f58078266a53d61 + version: 4251bc56660a7aa913f49064cc499f1307bdf6f7 - name: openstack_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts - version: 76193ffff33863ae08bb78669bc22a064baeeac2 + version: d385bceab0dfc9a58b85dc6339dffa37b1d11e8a - name: os_keystone scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_keystone @@ -57,7 +57,7 @@ - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh - version: d243340f7e2f44409b7db3676e58483d9cf97e02 + version: 4313f9eb4844a8adb0eddae328941c30aa2bd3ff - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer @@ -73,15 +73,15 @@ - name: os_gnocchi scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi - version: 8006033508c66b6a62493b28057e5c54ae550cf9 + version: 546fc030fe0146e0164f7cdda00e97ef61598f1d - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: c7f1bd183236d4eef35aeb66461585b8bc851e97 + version: 6574c9696e922da8c381a48d46d5bc05e20992dd - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon - version: 0b044bc7a22b88d711f5256852e8d4260ee51146 + version: bcb3d910bd9fd53bc23619297f73681834b94c12 - name: os_ironic scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ironic @@ -105,7 +105,7 @@ - name: os_sahara scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_sahara - version: 59837493e3cbb27a146b3dcf957a2e8f33a1e2a3 + version: 3d83481719a04d28a1d74db301be0fc616fd2538 - name: os_swift scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_swift diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index e1bda0a24c..d7df5cb6ae 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==9.0.1 -setuptools==28.8.0 +setuptools==30.0.0 wheel==0.29.0 diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index bc86e31740..538fdcc64d 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -33,6 +33,6 @@ ## This service has a different stable branch strategy to the rest of OpenStack. ## The SHA is recorded here to make the SHA updating easier. gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi -gnocchi_git_install_branch: 2cf420db477335608602352957626de5bf79dceb # HEAD of "stable/3.0" as of 18.11.2016 +gnocchi_git_install_branch: 2cf420db477335608602352957626de5bf79dceb # HEAD of "stable/3.0" as of 02.12.2016 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}" gnocchi_git_project_group: gnocchi_all diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 349269b949..0f18aa2019 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,60 +31,60 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: a2146b71de1b589b21f21aa0c585f796901d4700 # HEAD of "stable/newton" as of 18.11.2016 +requirements_git_install_branch: 177918ddb57303e1ab157e5afaeebb387e271611 # HEAD of "stable/newton" as of 02.12.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: c2ab5efa59e0db9d3e81b99e546ca06f12f4229c # HEAD of "stable/newton" as of 18.11.2016 +aodh_git_install_branch: c2ab5efa59e0db9d3e81b99e546ca06f12f4229c # HEAD of "stable/newton" as of 02.12.2016 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" aodh_git_project_group: aodh_all ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 93b927a03b54cb3d7b061595a218275acf664c4e # HEAD of "stable/newton" as of 18.11.2016 +ceilometer_git_install_branch: c4b08affa7ed56489c95b3be46df8054ef8221ad # HEAD of "stable/newton" as of 02.12.2016 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ceilometer_git_project_group: ceilometer_all ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: ed91915a4e217e519eeb2c0e3de14e9e73c3b002 # HEAD of "stable/newton" as of 18.11.2016 +cinder_git_install_branch: f9519cca0562543c20ef9fbb23b47291d7e25db1 # HEAD of "stable/newton" as of 02.12.2016 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" cinder_git_project_group: cinder_all ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 9cd964649f7256e2e0ac10dcc55efd3c45c261ab # HEAD of "stable/newton" as of 18.11.2016 +glance_git_install_branch: 9cd964649f7256e2e0ac10dcc55efd3c45c261ab # HEAD of "stable/newton" as of 02.12.2016 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" glance_git_project_group: glance_all ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 4e095b37f887f150573e9baa1b6e952ed7c861b9 # HEAD of "stable/newton" as of 18.11.2016 +heat_git_install_branch: 6e02e62fe45cddfe61e973eb4bb2e8a3b898a2a0 # HEAD of "stable/newton" as of 02.12.2016 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" heat_git_project_group: heat_all ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: e78453fb15399054d74a545e3042370f06ed86b5 # HEAD of "stable/newton" as of 18.11.2016 +horizon_git_install_branch: bbd1637bbb4a047c32a5a6f2be64281e1037d525 # HEAD of "stable/newton" as of 02.12.2016 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" horizon_git_project_group: horizon_all ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 74761eabaf96bb7986ef6603c3f74b78e673a052 # HEAD of "stable/newton" as of 18.11.2016 +ironic_dashboard_git_install_branch: 74761eabaf96bb7986ef6603c3f74b78e673a052 # HEAD of "stable/newton" as of 02.12.2016 ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}" ironic_dashboard_git_project_group: horizon_all ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: 5bae597b4d4a187976291ccec02d4f3803ccbd33 # HEAD of "stable/newton" as of 18.11.2016 +magnum_dashboard_git_install_branch: 5bae597b4d4a187976291ccec02d4f3803ccbd33 # HEAD of "stable/newton" as of 02.12.2016 magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}" magnum_dashboard_git_project_group: horizon_all @@ -96,88 +96,88 @@ neutron_lbaas_dashboard_git_project_group: horizon_all ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: e8c6017ef042c959e355be7f46071964b8fea327 # HEAD of "stable/newton" as of 18.11.2016 +sahara_dashboard_git_install_branch: e8c6017ef042c959e355be7f46071964b8fea327 # HEAD of "stable/newton" as of 02.12.2016 sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}" sahara_dashboard_git_project_group: horizon_all ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: 3609439599571a5919c4e1d328c1f06a8e4422c9 # HEAD of "stable/newton" as of 18.11.2016 +keystone_git_install_branch: 3609439599571a5919c4e1d328c1f06a8e4422c9 # HEAD of "stable/newton" as of 02.12.2016 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" keystone_git_project_group: keystone_all ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 7295beec362d4754d1eb6c353efdf14a8edde8cb # HEAD of "stable/newton" as of 18.11.2016 +neutron_git_install_branch: 62f879d51e2a932028d46f32f3f4af57b32a9993 # HEAD of "stable/newton" as of 02.12.2016 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_git_project_group: neutron_all neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: bff11c5fa14bce26526d38167d5c67b1afeb45ba # HEAD of "stable/newton" as of 18.11.2016 +neutron_lbaas_git_install_branch: be0370a8d27a63ac1b793667ea22982f50cdb5f5 # HEAD of "stable/newton" as of 02.12.2016 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_project_group: neutron_all neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 89dac51538b711d8e966d4a4a50f9cdfafa92fc5 # HEAD of "stable/newton" as of 18.11.2016 +neutron_vpnaas_git_install_branch: 89dac51538b711d8e966d4a4a50f9cdfafa92fc5 # HEAD of "stable/newton" as of 02.12.2016 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_project_group: neutron_all neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 7345510f36d26863c25ba5737b0057b78060d2ad # HEAD of "stable/newton" as of 18.11.2016 +neutron_fwaas_git_install_branch: 7345510f36d26863c25ba5737b0057b78060d2ad # HEAD of "stable/newton" as of 02.12.2016 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_project_group: neutron_all neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 2b27679fb6d690e6f65a98dfa2828bc367aa30ad # HEAD of "stable/newton" as of 18.11.2016 +neutron_dynamic_routing_git_install_branch: 2b27679fb6d690e6f65a98dfa2828bc367aa30ad # HEAD of "stable/newton" as of 02.12.2016 neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}" neutron_dynamic_routing_git_project_group: neutron_all ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: 11374321a594c700a857281f7149f02c66c3839c # HEAD of "stable/newton" as of 18.11.2016 +nova_git_install_branch: 71aeef4c47526d252284a441ce30b9208c592c33 # HEAD of "stable/newton" as of 02.12.2016 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" nova_git_project_group: nova_all ## PowerVM Virt Driver nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm -nova_powervm_git_install_branch: 75e9992b11e27bcde291f73ba6f6235727c9aae5 # HEAD of "stable/newton" as of 18.11.2016 +nova_powervm_git_install_branch: 6e8f7d1a9041c7d7bf36abc70a6e664840b3f189 # HEAD of "stable/newton" as of 02.12.2016 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}" nova_powervm_git_project_group: nova_compute ## LXD Virt Driver nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd -nova_lxd_git_install_branch: 96d7dc0b8d75b67bd36851fb4dec515dcb4edbb4 # HEAD of "stable/newton" as of 18.11.2016 +nova_lxd_git_install_branch: 96d7dc0b8d75b67bd36851fb4dec515dcb4edbb4 # HEAD of "stable/newton" as of 02.12.2016 nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}" nova_lxd_git_project_group: nova_compute ## Sahara service sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: 784a3dd96a68eff3d5a83f14942ae4bc337bbbc5 # HEAD of "stable/newton" as of 18.11.2016 +sahara_git_install_branch: 04d5b6f557cf5e97dc9a57c61c98cb0dc4c17af1 # HEAD of "stable/newton" as of 02.12.2016 sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}" sahara_git_project_group: sahara_all ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 4ecda96b750eb4036ace617b3c8354c7d78fdbdc # HEAD of "stable/newton" as of 18.11.2016 +swift_git_install_branch: bf74d5a0183c9db38a6ff9bf1ab564ea80def703 # HEAD of "stable/newton" as of 02.12.2016 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" swift_git_project_group: swift_all ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: fcf32419cd3d548b71b0bcbff0de590fbc036565 # HEAD of "stable/newton" as of 18.11.2016 +ironic_git_install_branch: f2cacebd5f48b1b6501fef9916ab9cf40bbf9a96 # HEAD of "stable/newton" as of 02.12.2016 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}" ironic_git_project_group: ironic_all ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum -magnum_git_install_branch: afe9378991a114760be3c197e258eb130a3429e2 # HEAD of "stable/newton" as of 18.11.2016 +magnum_git_install_branch: ada6f27968bfa52bb28201b716ef4e51e1ae8816 # HEAD of "stable/newton" as of 02.12.2016 magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}" magnum_git_project_group: magnum_all diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 2a2ad99be9..5cbf42eb00 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -14,7 +14,7 @@ # limitations under the License. ## OpenStack Source Code Release -openstack_release: 14.0.3 +openstack_release: 14.0.4 ## Verbosity Options debug: False @@ -39,7 +39,7 @@ rsyslog_client_package_state: "{{ package_state }}" # These pins are updated through the sources-branch-updater script pip_packages: - pip==9.0.1 - - setuptools==28.8.0 + - setuptools==30.0.0 - wheel==0.29.0 pip_links: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 7f94cd49a4..22231faf00 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------' MAX_RETRIES=${MAX_RETRIES:-5} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==28.8.0 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==30.0.0 wheel==0.29.0 '} COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"} # The default SSHD configuration has MaxSessions = 10. If a deployer changes