Merge "Update all SHAs for 13.3.6" into stable/mitaka

2016-10-17 18:43:40 +00:00 · 2016-10-17 18:43:40 +00:00 · 2c2888cd9e
commit 2c2888cd9e
parent 7304148941 c5a5604f0f
6 changed files with 25 additions and 25 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -5,7 +5,7 @@
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 2c420642cad6923630d9e3caca95ab891671fdd4
+  version: 2eba5f900311531f5c1d8a93e490124b04349cd0
 - name: pip_lock_down
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
@ -37,11 +37,11 @@
 - name: openstack-ansible-security
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: 1446cc34170a95f73736927a6b22559c01221943
+  version: d57be755359fae16908d6f9fce8aaf5b35af49da
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: 52b49aa7b161de5b75aefa0f02423fa601ccbd81
+  version: 48eeb134779dc51bd0d3c1374ff4090f20b1a6f6
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
@ -93,12 +93,12 @@
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: a8b32c720fd612507b8e168e1fb1aeed72e4600d
+  version: 74321eb4900411d350d6630cff2792e0348e3b3e
 - name: plugins
  path: /etc/ansible
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: 2fc5ceb95fd2fd30ebaefb1b73d3f831cd82ab93
+  version: 6fd7a88711bd2625185547d143271a0972e95e7a
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
--- 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==28.0.0
+setuptools==28.3.0
 wheel==0.29.0
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,88 +31,88 @@

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 5cc4e35e177b91bf2f2a6f4e4671719e9cb1aba5 # HEAD of "stable/mitaka" as of 29.09.2016
+requirements_git_install_branch: d5b4b834c05604e32340994a4064f32755070053 # HEAD of "stable/mitaka" as of 14.10.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: aa2c31369bd32c7ac07ede0ac13785c18255e8be # HEAD of "stable/mitaka" as of 29.09.2016
+aodh_git_install_branch: aa2c31369bd32c7ac07ede0ac13785c18255e8be # HEAD of "stable/mitaka" as of 14.10.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: 10639a4299fdedbb8b6dcd5e82e795d573edb6d0 # HEAD of "stable/mitaka" as of 29.09.2016
+ceilometer_git_install_branch: 10639a4299fdedbb8b6dcd5e82e795d573edb6d0 # HEAD of "stable/mitaka" as of 14.10.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: e6f90c767a2ce39b789aa53ed393deac227c0127 # HEAD of "stable/mitaka" as of 29.09.2016
+cinder_git_install_branch: f90114b4498121e5512c0ca463c8cc608f4d5d9a # HEAD of "stable/mitaka" as of 14.10.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: c90830d71969f68768d898c1c178489f602214e2 # HEAD of "stable/mitaka" as of 29.09.2016
+glance_git_install_branch: 6c4bd0ec5841a9e204649e9f8a055c3c1d7ca9d8 # HEAD of "stable/mitaka" as of 14.10.2016
 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"


 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: ed46562157d2f9983f5665394ec47d2e27aad0df # HEAD of "stable/mitaka" as of 29.09.2016
+heat_git_install_branch: 33d2395bfa0ed6b9305e8cc231e66b81e1887ef0 # HEAD of "stable/mitaka" as of 14.10.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: 6c6bccec4482ddb37f08a17633dbd01d88158f0f # HEAD of "stable/mitaka" as of 29.09.2016
+horizon_git_install_branch: ef68173bd73c05ab123f8f715a40c5df8fd3b0c3 # HEAD of "stable/mitaka" as of 14.10.2016
 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"

 ## Horizon LBaaS dashboard plugin
 neutron_lbaas_dashboard_git_repo: https://github.com/openstack/neutron-lbaas-dashboard
-neutron_lbaas_dashboard_git_install_branch: b85927dad8169ac672ab2daa111a2b8a113464c0 # HEAD of "stable/mitaka" as of 29.09.2016
+neutron_lbaas_dashboard_git_install_branch: b85927dad8169ac672ab2daa111a2b8a113464c0 # HEAD of "stable/mitaka" as of 14.10.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: f1d9c54ef07c61cb80def5779802cc4daf45f4cb # HEAD of "stable/mitaka" as of 29.09.2016
+keystone_git_install_branch: 012bc3d436fb29ef99aec405d13af5e5a1cfd3df # HEAD of "stable/mitaka" as of 14.10.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: 664a725142eb34f9e3894a776032caca2e40036a # HEAD of "stable/mitaka" as of 29.09.2016
+neutron_git_install_branch: 5860fb21e966ab8f1e011654dd477d7af35f7a27 # HEAD of "stable/mitaka" as of 14.10.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: a2d5aed3452cf4d0885051b303ecb51ab1444c1a # HEAD of "stable/mitaka" as of 29.09.2016
+neutron_lbaas_git_install_branch: a6102279c7061ebc6e4f144413eb52595d1604be # HEAD of "stable/mitaka" as of 14.10.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: ea355d1bc6e173cd56c6a975b88e5d5e1f901b5c # HEAD of "stable/mitaka" as of 29.09.2016
+neutron_vpnaas_git_install_branch: ea355d1bc6e173cd56c6a975b88e5d5e1f901b5c # HEAD of "stable/mitaka" as of 14.10.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: cbe18b5de196e8edb9b2528a257206c9463c714c # HEAD of "stable/mitaka" as of 29.09.2016
+neutron_fwaas_git_install_branch: 8d1fa056938067e7d8f4c2926d714d5effa8dbe9 # HEAD of "stable/mitaka" as of 14.10.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: dd30603f91e6fd3d1a4db452f20a51ba8820e1f4 # HEAD of "stable/mitaka" as of 29.09.2016
+nova_git_install_branch: b3772b788d4a10705120b7f73defc6e338d0dd2d # HEAD of "stable/mitaka" as of 14.10.2016
 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"


 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: d75e6d39789e1cc83ac0614f5f4697e1df2f1f57 # HEAD of "stable/mitaka" as of 29.09.2016
+swift_git_install_branch: 8eab1444da3edc3114e89b93250644abbbd34204 # HEAD of "stable/mitaka" as of 14.10.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: 5a5b3dcafa94868e5f0015d4740e770dca722ad5 # HEAD of "stable/mitaka" as of 29.09.2016
+ironic_git_install_branch: 3a1b3e44b0aae27130f9321fce37544d5cd0e778 # HEAD of "stable/mitaka" as of 14.10.2016
 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
--- 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: 13.3.5
+openstack_release: 13.3.6

 # Global minimum kernel requirement
 openstack_host_required_kernel: 3.13.0-34-generic
--- a/playbooks/inventory/group_vars/hosts.yml
+++ b/playbooks/inventory/group_vars/hosts.yml
@ -67,7 +67,7 @@ pip_links:
 # These pins are updated through the sources-branch-updater script
 pip_packages:
  - pip==8.1.2
-  - setuptools==28.0.0
+  - setuptools==28.3.0
  - wheel==0.29.0

 ## Memcached options
--- 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:-""}
 STARTTIME="${STARTTIME:-$(date +%s)}"
-PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==28.0.0 wheel==0.29.0'}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==28.3.0 wheel==0.29.0'}

 # The default SSHD configuration has MaxSessions = 10. If a deployer changes
 #  their SSHD config, then the FORKS may be set to a higher number. We set the