Skip to content

Commit

Permalink
Update all SHAs for 13.3.2
Browse files Browse the repository at this point in the history
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: I1104152b177cdf745203c48be9d2466f78a7f4b8
Depends-On: Id875cc0a8013fbf89bf95848937083d12eadf0e0
  • Loading branch information
Jesse Pretorius committed Aug 15, 2016
1 parent 94c1ba3 commit be557e8
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 34 deletions.
28 changes: 14 additions & 14 deletions ansible-role-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- name: lxc_container_create
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
version: 7fe875d93c07e5c95fec18d73ebe7459f8718ce6
version: 9cbae3e443dc8f63a980e058df85863bdd279a4e
- name: lxc_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
Expand All @@ -45,55 +45,55 @@
- name: os_keystone
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
version: cc50cb1e66538b401b647fbba07ea8c43d74f579
version: 1432dea62ad4c63e69001e9a55cf543e7fb43012
- name: openstack_openrc
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
version: c5a661bc493722889b145f7a19fe55a6465790f4
- name: os_aodh
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
version: dc6b2380932b2958e082be2ca5d981208871fe9d
version: 0c80b7c02012582228cbaa1c93e2610f0ff52abd
- name: os_ceilometer
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
version: 48630e2c10546930e2a705f3a7d639f0922149c0
version: 3a24b01d0685a3ea1153e058ad6c19003bcc48e4
- name: os_cinder
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
version: 6ae8302a1771ef2069a5387289ad97a63827fcf2
version: 77f138e8894d161ec487af1e3447cd27e3b161d9
- name: os_glance
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
version: 66ebe4c5a05511ab8959606fd4a178ec3c376200
version: ec9ae0917183b644c61a1fb6d74b4fdf34817e30
- name: os_heat
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_heat
version: 4a4b9ae0f33018ba2cfa018abad2c00ccff932b6
version: dcff3d073520961d5e0e692aad0d5636254a3a0b
- name: os_horizon
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
version: 6048f16c2d4dcbf994bbc55290ae963f3b558e85
version: 252fa22de7209bc51e2370431104fa004477f607
- name: os_ironic
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
version: a6e7556ca9326fdf577aff0f07cdb96b046926b9
version: 03443e4d9b1dcb939f34c521a99b17022ec71470
- name: os_neutron
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
version: ba7b2c88cd966da3187ea3b4ec88211d94afcb42
version: 5a53856cb33b2d8b367b76416ffa570471ca6897
- name: os_nova
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
version: e4d793ef76bd1afa882bfbf055d23dea97facb58
version: bd83209c1948eefb079f3fc1b8775094d89c510f
- name: os_swift
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
version: f2e3c777cf22b5072495543ca3c7b2d6ec1a0818
version: 79638f5761be711d094e7679893b0cf22d604e80
- name: os_tempest
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
version: 13edcc092597b7109d0f75435ab4d07d56149998
version: 81b2bdbde5565d7ff172546f5b580097849d2a65
- name: plugins
path: /etc/ansible
scm: git
Expand All @@ -114,7 +114,7 @@
- name: rsyslog_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
version: ea665c97150669e0304ce3b96de854227ab37e9a
version: 3bcfed8a37a6f09b0ca2b106fb7adfcd72b1e371
- name: rsyslog_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
Expand Down
2 changes: 1 addition & 1 deletion global-requirement-pins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
### These pins are updated through the sources-branch-updater script ###
###
pip==8.1.2
setuptools==25.1.1
setuptools==25.2.0
wheel==0.29.0
32 changes: 16 additions & 16 deletions playbooks/defaults/repo_packages/openstack_services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,88 +31,88 @@

## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: bcdf5395185513fcefaf5420f39f709121be2700 # HEAD of "stable/mitaka" as of 01.08.2016
requirements_git_install_branch: bcdf5395185513fcefaf5420f39f709121be2700 # HEAD of "stable/mitaka" as of 15.08.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: 0a0a02aa0032235e80109e53912016a96105a243 # HEAD of "stable/mitaka" as of 01.08.2016
aodh_git_install_branch: 8b46d8a703be68a9d365a2fb8e354c0a47f13757 # HEAD of "stable/mitaka" as of 15.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: 1b78aab869ab04c394aed5368ee457e02e6bcd8b # HEAD of "stable/mitaka" as of 01.08.2016
ceilometer_git_install_branch: 10639a4299fdedbb8b6dcd5e82e795d573edb6d0 # HEAD of "stable/mitaka" as of 15.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: 0d22ead73e53a2fffc9659538e3693d5d012fba2 # HEAD of "stable/mitaka" as of 01.08.2016
cinder_git_install_branch: 796cad307c88ae1a7991f0289ac17233e2e3e31d # HEAD of "stable/mitaka" as of 15.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: a79d402abfbd1fee474fe4104d64e59f87fc24be # HEAD of "stable/mitaka" as of 01.08.2016
glance_git_install_branch: ab4519f9bc9a093ba0ac3b1d8c6d77a9312f6319 # HEAD of "stable/mitaka" as of 15.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: 656ac73c6c452e2bc14d3fd34b2ea4bc63585c15 # HEAD of "stable/mitaka" as of 01.08.2016
heat_git_install_branch: 816dc3ad3510db2fdba4d6b16b0c3229ad08475f # HEAD of "stable/mitaka" as of 15.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: 1417b2208587b2c4da25d1cafbec6948f443e60a # HEAD of "stable/mitaka" as of 01.08.2016
horizon_git_install_branch: 4b232c4605a6eee7278aff4f6c3c84913ea70577 # HEAD of "stable/mitaka" as of 15.08.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 01.08.2016
neutron_lbaas_dashboard_git_install_branch: b85927dad8169ac672ab2daa111a2b8a113464c0 # HEAD of "stable/mitaka" as of 15.08.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: f8c65c10dfe55787e9d5755f4986e8808aa6aa28 # HEAD of "stable/mitaka" as of 01.08.2016
keystone_git_install_branch: f8c65c10dfe55787e9d5755f4986e8808aa6aa28 # HEAD of "stable/mitaka" as of 15.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: 803cc36fd89dd89e1295768bad0269606fb5b30f # HEAD of "stable/mitaka" as of 01.08.2016
neutron_git_install_branch: 5e6168fab36415d6d677c32501e64371f74a6992 # HEAD of "stable/mitaka" as of 15.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: 799b93e09fe92ffea883238c34676c4342b9f75e # HEAD of "stable/mitaka" as of 01.08.2016
neutron_lbaas_git_install_branch: 680998ee3434d0f71f7588784986db0e01c792cd # HEAD of "stable/mitaka" as of 15.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: ea355d1bc6e173cd56c6a975b88e5d5e1f901b5c # HEAD of "stable/mitaka" as of 01.08.2016
neutron_vpnaas_git_install_branch: ea355d1bc6e173cd56c6a975b88e5d5e1f901b5c # HEAD of "stable/mitaka" as of 15.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: cbe18b5de196e8edb9b2528a257206c9463c714c # HEAD of "stable/mitaka" as of 01.08.2016
neutron_fwaas_git_install_branch: cbe18b5de196e8edb9b2528a257206c9463c714c # HEAD of "stable/mitaka" as of 15.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: b77a77d4cc9099da06932a17208963fb52c0c414 # HEAD of "stable/mitaka" as of 01.08.2016
nova_git_install_branch: 67cfb16a4f22e9f0b1428cfed07c7a766a7a927b # HEAD of "stable/mitaka" as of 15.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: d75e6d39789e1cc83ac0614f5f4697e1df2f1f57 # HEAD of "stable/mitaka" as of 01.08.2016
swift_git_install_branch: d75e6d39789e1cc83ac0614f5f4697e1df2f1f57 # HEAD of "stable/mitaka" as of 15.08.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: 467d880ebe10ed8b61e80cc7006a9d56c1c36c3f # HEAD of "stable/mitaka" as of 01.08.2016
ironic_git_install_branch: 467d880ebe10ed8b61e80cc7006a9d56c1c36c3f # HEAD of "stable/mitaka" as of 15.08.2016
ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
2 changes: 1 addition & 1 deletion playbooks/inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

## OpenStack Source Code Release
openstack_release: 13.3.1
openstack_release: 13.3.2

# Global minimum kernel requirement
openstack_host_required_kernel: 3.13.0-34-generic
2 changes: 1 addition & 1 deletion playbooks/inventory/group_vars/hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pip_links:
# These pins are updated through the sources-branch-updater script
pip_packages:
- pip==8.1.2
- setuptools==25.1.1
- setuptools==25.2.0
- wheel==0.29.0

## Memcached options
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
features:
- A new variable has been added to allow a deployer to control
the restart of containers via the handler. This new option is
``lxc_container_allow_restarts`` and has a default of ``true``.
If a deployer wishes to disable the auto-restart functionality
they can set this value to ``false`` and automatic container
restarts that are not absolutely required will be disabled.
2 changes: 1 addition & 1 deletion scripts/scripts-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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==25.1.1 wheel==0.29.0'}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==25.2.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
Expand Down

0 comments on commit be557e8

Please sign in to comment.