openstack
/
openstack-ansible
Code Issues Proposed changes

Update all SHAs for 13.3.13 

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.

Change-Id: Id59f1ca6ebd2031a12458dcc58a830e5ce86a217
Depends-On: Ie0ad1a225b66392d432beeee706ebe5ae2c9d4f1
This commit is contained in:
Andy McCrae 2017-01-19 13:55:53 +00:00
parent 7a15b6d5de
commit 77cbe78f32
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible-role-requirements.yml
View File

@ -61,7 +61,7 @@
- name: os_cinder
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
version: b41c5886ec11e712b0a52860b4da605676c003c8
version: cb20d214dfb29f2c7ec14daf3dbfbc31e69f9ce8
- name: os_glance
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance

2
global-requirement-pins.txt
View File

@ -10,5 +10,5 @@
### These pins are updated through the sources-branch-updater script ###
###
pip==9.0.1
setuptools==32.3.1
setuptools==33.1.1
wheel==0.29.0

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

@ -31,88 +31,88 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: 48a8df61b69e0996d84260496b5c1e6cc37e4af6 # HEAD of "stable/mitaka" as of 05.01.2017
requirements_git_install_branch: 48a8df61b69e0996d84260496b5c1e6cc37e4af6 # HEAD of "stable/mitaka" as of 19.01.2017
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 05.01.2017
aodh_git_install_branch: 5dd569dd6178510c080e91e77ed3fedb8f48aef0 # HEAD of "stable/mitaka" as of 19.01.2017
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: 1c5ad24f221f90310577b1de29acdd4f496ea705 # HEAD of "stable/mitaka" as of 05.01.2017
ceilometer_git_install_branch: 1c5ad24f221f90310577b1de29acdd4f496ea705 # HEAD of "stable/mitaka" as of 19.01.2017
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: 753a147768be3ea9813f45c6adc414df69f50dee # HEAD of "stable/mitaka" as of 05.01.2017
cinder_git_install_branch: 753a147768be3ea9813f45c6adc414df69f50dee # HEAD of "stable/mitaka" as of 19.01.2017
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: 6c4bd0ec5841a9e204649e9f8a055c3c1d7ca9d8 # HEAD of "stable/mitaka" as of 05.01.2017
glance_git_install_branch: 6c4bd0ec5841a9e204649e9f8a055c3c1d7ca9d8 # HEAD of "stable/mitaka" as of 19.01.2017
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: 1d78f3baaebaf98c1a753c3965f082b0d3c55ee1 # HEAD of "stable/mitaka" as of 05.01.2017
heat_git_install_branch: 70136e8b812749b227372740926e17d893e23b7d # HEAD of "stable/mitaka" as of 19.01.2017
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: 8bb9a1979eb7e76ec53440d41f27b1e9cfd81dac # HEAD of "stable/mitaka" as of 05.01.2017
horizon_git_install_branch: dc7c7fe04d78105271a7030a7bdc9e31008fbf54 # HEAD of "stable/mitaka" as of 19.01.2017
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 05.01.2017
neutron_lbaas_dashboard_git_install_branch: b85927dad8169ac672ab2daa111a2b8a113464c0 # HEAD of "stable/mitaka" as of 19.01.2017
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: a244e9bea6e4691a910b777598121c99384dd089 # HEAD of "stable/mitaka" as of 05.01.2017
keystone_git_install_branch: a244e9bea6e4691a910b777598121c99384dd089 # HEAD of "stable/mitaka" as of 19.01.2017
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: f84613cc6e4cb03d8bb14f388f4b836b132562ed # HEAD of "stable/mitaka" as of 05.01.2017
neutron_git_install_branch: 05b9e1526aa64aa3699f0796f2b46e10d809264a # HEAD of "stable/mitaka" as of 19.01.2017
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: efacaecfba9d18960b54cd8fefba36e0e4f2126f # HEAD of "stable/mitaka" as of 05.01.2017
neutron_lbaas_git_install_branch: efacaecfba9d18960b54cd8fefba36e0e4f2126f # HEAD of "stable/mitaka" as of 19.01.2017
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: 035f12f9900ff322f5cbb2b134ba4ca26f7fa022 # HEAD of "stable/mitaka" as of 05.01.2017
neutron_vpnaas_git_install_branch: 035f12f9900ff322f5cbb2b134ba4ca26f7fa022 # HEAD of "stable/mitaka" as of 19.01.2017
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: 8d1fa056938067e7d8f4c2926d714d5effa8dbe9 # HEAD of "stable/mitaka" as of 05.01.2017
neutron_fwaas_git_install_branch: 8d1fa056938067e7d8f4c2926d714d5effa8dbe9 # HEAD of "stable/mitaka" as of 19.01.2017
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: d726e0d7008354dcc054b5d8b95b6071c83f8da2 # HEAD of "stable/mitaka" as of 05.01.2017
nova_git_install_branch: d726e0d7008354dcc054b5d8b95b6071c83f8da2 # HEAD of "stable/mitaka" as of 19.01.2017
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: 79b0e5bc7c54acf8d607f5010f1f68f295971acf # HEAD of "stable/mitaka" as of 05.01.2017
swift_git_install_branch: 79b0e5bc7c54acf8d607f5010f1f68f295971acf # HEAD of "stable/mitaka" as of 19.01.2017
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: 2f5787e5b8db9f843afeb8053e9ee85234c2e690 # HEAD of "stable/mitaka" as of 05.01.2017
ironic_git_install_branch: 7d2e71c0e40a85f32da8a8d0b66cb449c80a8955 # HEAD of "stable/mitaka" as of 19.01.2017
ironic_git_dest: "/opt/ironic_{{ ironic_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: 13.3.12
openstack_release: 13.3.13
# Global minimum kernel requirement
openstack_host_required_kernel: 3.13.0-34-generic

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

@ -67,7 +67,7 @@ pip_links:
# These pins are updated through the sources-branch-updater script
pip_packages:
- pip==9.0.1
- setuptools==32.3.1
- setuptools==33.1.1
- wheel==0.29.0
## Memcached options

2
releasenotes/notes/horizon-arbitrary-config-8a36e4bd6818afe1.yaml
View File

@ -3,4 +3,4 @@ features:
- Horizon now has the ability to set arbitrary configuration options using
global option ``horizon_config_overrides`` in YAML format. The overrides
follow the same pattern found within the other OpenStack service
overrides. `General documentation on overrides can be found here <http://docs.openstack.org/developer/openstack-ansible/mitaka/install-guide/configure-openstack.html>`_.
overrides. `General documentation on overrides can be found here <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-openstack.html#overriding-openstack-configuration-defaults>`_.

2
releasenotes/notes/neutron-fwaas-5c7c6508f2cc05c3.yaml
View File

@ -4,7 +4,7 @@ features:
configured. Please see the `FWaaS Configuration Reference
<http://docs.openstack.org/admin-guide-cloud/networking_introduction.html#firewall-as-a-service-fwaas-overview>`_
for details about the what the service is and what it provides. See the
`FWaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/mitaka/install-guide/configure-network-services.html#firewall-service-optional>`_
`FWaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-fwaas.html>`_
for implementation details.
upgrade:
- Database migration tasks have been added for the FWaaS neutron plugin.

2
releasenotes/notes/neutron-vpnaas-5c7c6508f2cc05c5.yaml
View File

@ -4,5 +4,5 @@ features:
configured. Please see the `OpenStack Networking Guide
<http://docs.openstack.org/mitaka/networking-guide/>`_ for details
about the what the service is and what it provides. See the
`VPNaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/mitaka/install-guide/configure-network-services.html#virtual-private-network-service-optional>`_
`VPNaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-network-services.html#virtual-private-network-service-optional>`_
for implementation details.

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==9.0.1 setuptools==32.3.1 wheel==0.29.0'}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==33.1.1 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