openstack
/
openstack-ansible
Code Issues Proposed changes

Update all SHAs for 12.2.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.

Change-Id: Idfd000404bbbd3f458859a131c02a61c1c323985
Depends-On: Id965e1b1ff073b462027b1aadeab4ca44f498a80
This commit is contained in:
Jesse Pretorius 2016-08-01 16:27:21 +01:00 committed by Jesse Pretorius (odyssey4me)
parent d79ddc6087
commit e63cb1b1ed
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible-role-requirements.yml
View File

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

4
global-requirement-pins.txt
View File

@ -10,5 +10,5 @@
### These pins are updated through the sources-branch-updater script ###
###
pip==8.1.2
setuptools==24.0.3
wheel==0.29.0
setuptools==25.1.1
wheel==0.26.0

26
playbooks/defaults/repo_packages/openstack_services.yml
View File

@ -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 14.07.2016
aodh_git_install_branch: 835283da9cf8b6a5c5cc4395cfda34867c9527fe # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
ceilometer_git_install_branch: 5de88a1d58496ec7c933229d0f9dcd8e308c2693 # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
cinder_git_install_branch: 641d28e31a978fa7b3c8e6c5f6a235d2420f0123 # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
glance_git_install_branch: b495488ebffdbd75448395ac502fbbea4b4cef06 # HEAD of "stable/liberty" as of 01.08.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: d98ed0153d7dcece37c49caba8462c9adc158a09 # HEAD of "stable/liberty" as of 14.07.2016
heat_git_install_branch: d98ed0153d7dcece37c49caba8462c9adc158a09 # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
horizon_git_install_branch: 55768982f7dc6856962012e7e45f0e6e79c2fee5 # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
keystone_git_install_branch: 76b8d42003951c7803b215ae6165766960f04247 # HEAD of "stable/liberty" as of 01.08.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: e6d24dce95ff596837101d47d541ee47e43992d1 # HEAD of "stable/liberty" as of 14.07.2016
neutron_git_install_branch: cc6c2029ba05068df025643efdb373503b6cd40f # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
neutron_lbaas_git_install_branch: 19c0768c4de5deb023c8f701aa76faceb04de5fc # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
neutron_vpnaas_git_install_branch: 9f574a2cfcb5586512d06a434edb3e05f4b29105 # HEAD of "stable/liberty" as of 01.08.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: 7c747579c2b22c420cb1302abe0eabab12f162df # HEAD of "stable/liberty" as of 14.07.2016
neutron_fwaas_git_install_branch: 7c747579c2b22c420cb1302abe0eabab12f162df # HEAD of "stable/liberty" as of 01.08.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 14.07.2016
nova_git_install_branch: 3e1a0db901e2f305949fedfb833f8dbc1f8fb254 # HEAD of "stable/liberty" as of 01.08.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: 19b3f9e1885591414cd73d8369a2f97cecc32b96 # HEAD of "stable/liberty" as of 14.07.2016
swift_git_install_branch: 19b3f9e1885591414cd73d8369a2f97cecc32b96 # HEAD of "stable/liberty" as of 01.08.2016
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"

2
playbooks/inventory/group_vars/all.yml
View File

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

2
playbooks/inventory/group_vars/hosts.yml
View File

@ -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==24.0.3
- setuptools==25.1.1
- wheel==0.26.0
## Memcached options

2
scripts/scripts-library.sh
View File

@ -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==24.0.3 wheel==0.26.0'}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==25.1.1 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