Update all SHAs for 12.1.1

This patch includes updates of any changed paste, policy and rootwrap
configurations. It also includes updates to the pip, wheel and
setuptools pins. Finally, it also updates the required roles and
copies any release notes from those roles.

It also includes the following:

- The requirements.txt file has been updated to ensure that it
  has the same requirements as those in OpenStack global-requirements
  for stable/liberty.

- The sources-branch-updater script will only update SHA's/tags
  for OpenStack roles. This is primarily for usage in stable
  branches where external roles must not be changed after release.

- The script will no longer update the *requirements.txt files.
  These files are managed by the OpenStack Global Requirements
  management process.

- The pins for pip, setuptools and wheels are now set in the
  global-requirement-pins.txt file in order to ensure that it
  takes precedence in the repo build process above all other
  requirements.

- The order of the requirements.txt file has been changed to ensure
  that pip, setuptools and wheels is installed first whenever the
  requirements.txt file is used.

- The pin comment has been removed from the requirements.txt file
  as it no longer applies.

Change-Id: Ic8a2d8d34418f71d55d3e359599a1b449b70a94f
Depends-On: I5be589bc34ab4f0478c76733ebf380e975071564

ansible-role-requirements.yml

@@ -9,4 +9,4 @@
 - name: openstack-ansible-security
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: 9e67ff3184f61fabd8a0c5221f171e252307b52b
+  version: 4755f52897df639016dc0ce0a128b641d4382d30

global-requirement-pins.txt

@@ -1,2 +1,14 @@
-# This file was created to set pins that are needed but should not be
-#  installed as base requirements
+# This file should only be used to set python package pins that are
+# not present in OpenStack's upper-constraints. Any pins present in
+# this file will override any requirements set in *requirements.txt,
+# upper-constraints and any roles/vars.
+#
+# Use this file with caution!
+#
+###
+### These are pinned to ensure exactly the same behaviour forever!   ###
+### These pins are updated through the sources-branch-updater script ###
+###
+pip==8.1.2
+setuptools==24.0.3
+wheel==0.29.0

playbooks/defaults/repo_packages/openstack_services.yml

@@ -37,71 +37,71 @@ requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | r
 
 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: 73c64955d560db2c97f81b381bc122a7697352c4 # HEAD of "stable/liberty" as of 01.07.2016
+aodh_git_install_branch: 73c64955d560db2c97f81b381bc122a7697352c4 # HEAD of "stable/liberty" as of 14.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: 5de88a1d58496ec7c933229d0f9dcd8e308c2693 # HEAD of "stable/liberty" as of 01.07.2016
+ceilometer_git_install_branch: 5de88a1d58496ec7c933229d0f9dcd8e308c2693 # HEAD of "stable/liberty" as of 14.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: 41cea9c20ae38578f722af48f4f9b9314fea91cf # HEAD of "stable/liberty" as of 01.07.2016
+cinder_git_install_branch: 41cea9c20ae38578f722af48f4f9b9314fea91cf # HEAD of "stable/liberty" as of 14.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: b495488ebffdbd75448395ac502fbbea4b4cef06 # HEAD of "stable/liberty" as of 01.07.2016
+glance_git_install_branch: b495488ebffdbd75448395ac502fbbea4b4cef06 # HEAD of "stable/liberty" as of 14.07.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: 3cb015e41015679af71c788b516c7de8280f3a30 # HEAD of "stable/liberty" as of 01.07.2016
+heat_git_install_branch: d98ed0153d7dcece37c49caba8462c9adc158a09 # HEAD of "stable/liberty" as of 14.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: 55768982f7dc6856962012e7e45f0e6e79c2fee5 # HEAD of "stable/liberty" as of 01.07.2016
+horizon_git_install_branch: 55768982f7dc6856962012e7e45f0e6e79c2fee5 # HEAD of "stable/liberty" as of 14.07.2016
 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
 
 
 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: 6bf21f3660658c8916365aa51bfd6fc61fbd7121 # HEAD of "stable/liberty" as of 01.07.2016
+keystone_git_install_branch: 6bf21f3660658c8916365aa51bfd6fc61fbd7121 # HEAD of "stable/liberty" as of 14.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: 49f0432cf387edac81cef8e3781a64ec1d1031a6 # HEAD of "stable/liberty" as of 01.07.2016
+neutron_git_install_branch: e6d24dce95ff596837101d47d541ee47e43992d1 # HEAD of "stable/liberty" as of 14.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: 19c0768c4de5deb023c8f701aa76faceb04de5fc # HEAD of "stable/liberty" as of 01.07.2016
+neutron_lbaas_git_install_branch: 19c0768c4de5deb023c8f701aa76faceb04de5fc # HEAD of "stable/liberty" as of 14.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: 9f574a2cfcb5586512d06a434edb3e05f4b29105 # HEAD of "stable/liberty" as of 01.07.2016
+neutron_vpnaas_git_install_branch: 9f574a2cfcb5586512d06a434edb3e05f4b29105 # HEAD of "stable/liberty" as of 14.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: 4db4a46df1ecffb452fdeb8c035e21c107d4f280 # HEAD of "stable/liberty" as of 01.07.2016
+neutron_fwaas_git_install_branch: 7c747579c2b22c420cb1302abe0eabab12f162df # HEAD of "stable/liberty" as of 14.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: c55aacfbacaa627eea9a3f20d3b8b4188552afe4 # HEAD of "stable/liberty" as of 01.07.2016
+nova_git_install_branch: c55aacfbacaa627eea9a3f20d3b8b4188552afe4 # HEAD of "stable/liberty" as of 14.07.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: b76bf34736db38f2c2112b9fa4f55b8014332a0f # HEAD of "stable/liberty" as of 01.07.2016
+swift_git_install_branch: 19b3f9e1885591414cd73d8369a2f97cecc32b96 # HEAD of "stable/liberty" as of 14.07.2016
 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"

playbooks/inventory/group_vars/all.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ## OpenStack Source Code Release
-openstack_release: 12.1.0
+openstack_release: 12.1.1
 
 # Global minimum kernel requirement
 openstack_host_required_kernel: 3.13.0-34-generic

playbooks/inventory/group_vars/hosts.yml

@@ -72,7 +72,7 @@ pip_get_pip_options: >
 # These pins are updated through the sources-branch-updater script
 pip_packages:
   - pip==8.1.2
-  - setuptools==23.1.0
+  - setuptools==24.0.3
   - wheel==0.26.0
 
 ## Memcached options

requirements.txt

@@ -1,13 +1,12 @@
-Jinja2>=2.6             # ansible
-netaddr>=0.7.12         # playbooks/inventory/dynamic_inventory.py
-paramiko>=1.13.0,<2     # ansible
-PrettyTable>=0.7,<0.8   # scripts/inventory-manage.py
-pycrypto>=2.6           # ansible
-PyYAML>=3.1.0           # ansible
-###
-### These are pinned to ensure exactly the same behaviour forever!   ###
-### These pins are updated through the sources-branch-updater script ###
-###
-pip==8.1.2
-setuptools==23.1.0
-wheel==0.26.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pip>=6.0 # MIT
+setuptools>=16.0,!=24.0.0 # PSF/ZPL
+wheel # MIT
+Jinja2>=2.8 # BSD License (3 clause)
+netaddr>=0.7.12,!=0.7.16 # BSD
+paramiko>=2.0 # LGPLv2.1+
+PrettyTable>=0.7,<0.8 # BSD
+pycrypto>=2.6 # Public Domain
+PyYAML>=3.1.0 # MIT

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==23.1.0 wheel==0.26.0'}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==24.0.3 wheel==0.26.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

scripts/sources-branch-updater.sh

@@ -145,7 +145,7 @@ PIP_CURRENT_OPTIONS="$(./scripts/get-pypi-pkg-version.py -p pip setuptools -l ho
 sed -i.bak "s|^PIP_INSTALL_OPTIONS=.*|PIP_INSTALL_OPTIONS=\$\{PIP_INSTALL_OPTIONS:-'${PIP_CURRENT_OPTIONS}'\}|" scripts/scripts-library.sh
 
 for pin in ${PIP_CURRENT_OPTIONS}; do
-  sed -i.bak "s|^$(echo ${pin} | cut -f1 -d=).*|${pin}|" *requirements.txt
+  sed -i.bak "s|^$(echo ${pin} | cut -f1 -d=).*|${pin}|" global-requirement-pins.txt
   sed -i.bak "s|^  - $(echo ${pin} | cut -f1 -d=).*|  - ${pin}|" playbooks/inventory/group_vars/hosts.yml
 done
 
@@ -156,8 +156,8 @@ echo "Updated pip install options/pins"
 if [[ "${OSA_BRANCH}" != "master" ]]; then
   echo "Updating ansible-role-requirements.yml"
 
-  # Loop through each of the role git sources
-  for role_src in $(awk '/src: / {print $2}' ansible-role-requirements.yml); do
+  # Loop through each of the role git sources, only looking for openstack roles
+  for role_src in $(awk '/src: .*\/openstack\// {print $2}' ansible-role-requirements.yml); do
 
     # Determine the role's name
     role_name=$(sed 's/^[ \t-]*//' ansible-role-requirements.yml | awk '/src: / || /name: / {print $2}' | grep -B1 "${role_src}" | head -n 1)