Skip to content

Commit

Permalink
Update all SHAs for 13.3.5
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: I7376e22579d8eaaf21990f1f1021f49529601fe7
Depends-On: I9c1827fa86194c1b3e217f432201777ce628db53
  • Loading branch information
Jesse Pretorius committed Sep 29, 2016
1 parent e3e60b1 commit a489036
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 30 deletions.
20 changes: 10 additions & 10 deletions ansible-role-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- name: pip_install
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-pip_install
version: a20cc9a43039961a8d6bed3123c9d37e290feadd
version: 2c420642cad6923630d9e3caca95ab891671fdd4
- name: pip_lock_down
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
Expand All @@ -17,15 +17,15 @@
- name: galera_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
version: af8e44dcb24ba04a4e1bd0437f532fbe7ac5d904
version: bf3480a7ff12ee91baaadd6b5c26758af1bbca3e
- name: keepalived
scm: git
src: https://github.com/evrardjp/ansible-keepalived
version: 1.6.0
- name: lxc_container_create
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
version: 7df1722b1cf0c41b4585c2efd96fb89fbe2c2931
version: a837705bb20aaddaec56dd3319b8a359c96296e4
- name: lxc_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
Expand All @@ -37,7 +37,7 @@
- name: openstack-ansible-security
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-security
version: ca9b7decdf77bdd20c13694e348e9e21ff7a1688
version: 1446cc34170a95f73736927a6b22559c01221943
- name: openstack_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
Expand Down Expand Up @@ -77,15 +77,15 @@
- name: os_ironic
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
version: 03443e4d9b1dcb939f34c521a99b17022ec71470
version: 3c1cd4724bae057b8d61d71d9a8795c634a0160a
- name: os_neutron
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
version: f8b0389d6d7d7d7d907cfc1a41f673cb67c55d1f
version: ae7af49d1670f5b37e64a0f0bb1590e20557d980
- name: os_nova
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
version: 34446081f941d217c44eb023ae6aafe6bf07716f
version: e2d63a85c0625195ca7eb15bee18bec108c4b4e6
- name: os_swift
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
Expand All @@ -98,15 +98,15 @@
path: /etc/ansible
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-plugins
version: 620c64e3160edb741bf853def67cf7d034396257
version: 2fc5ceb95fd2fd30ebaefb1b73d3f831cd82ab93
- name: rabbitmq_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
version: 7ac8e586d2fd92cd9bbee2d9993d032bcf1d6cb5
- name: repo_build
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_build
version: ae56b67cc07ca5a1e2dd03c74b5049b5942f41cf
version: 6e2989d73907d4e01573b1fd6359b146364a75cd
- name: repo_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_server
Expand All @@ -118,7 +118,7 @@
- name: rsyslog_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
version: da10c8b3c5cac67138f0d66b93fe08acba24a10a
version: 74cf6cd7f2bf8bb66811ba259ba66825b4cc8ea8
- name: sshd
scm: git
src: https://github.com/willshersystems/ansible-sshd
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==26.1.1
setuptools==28.0.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: 5cc4e35e177b91bf2f2a6f4e4671719e9cb1aba5 # HEAD of "stable/mitaka" as of 08.09.2016
requirements_git_install_branch: 5cc4e35e177b91bf2f2a6f4e4671719e9cb1aba5 # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
aodh_git_install_branch: aa2c31369bd32c7ac07ede0ac13785c18255e8be # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
ceilometer_git_install_branch: 10639a4299fdedbb8b6dcd5e82e795d573edb6d0 # HEAD of "stable/mitaka" as of 29.09.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: de954d04c2accb6b2f8aa9e9a59f5c64fe0109bc # HEAD of "stable/mitaka" as of 08.09.2016
cinder_git_install_branch: e6f90c767a2ce39b789aa53ed393deac227c0127 # HEAD of "stable/mitaka" as of 29.09.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: 9a6014148d2737448dfde1b419668393ee2a08b2 # HEAD of "stable/mitaka" as of 08.09.2016
glance_git_install_branch: c90830d71969f68768d898c1c178489f602214e2 # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
heat_git_install_branch: ed46562157d2f9983f5665394ec47d2e27aad0df # HEAD of "stable/mitaka" as of 29.09.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: 4ca41467d648ba17f6a8dfe3efb95bc3b1140e50 # HEAD of "stable/mitaka" as of 08.09.2016
horizon_git_install_branch: 6c6bccec4482ddb37f08a17633dbd01d88158f0f # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
neutron_lbaas_dashboard_git_install_branch: b85927dad8169ac672ab2daa111a2b8a113464c0 # HEAD of "stable/mitaka" as of 29.09.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: 3a1e41fecfe9e4b7dfa8391476202c3113456c89 # HEAD of "stable/mitaka" as of 08.09.2016
keystone_git_install_branch: f1d9c54ef07c61cb80def5779802cc4daf45f4cb # HEAD of "stable/mitaka" as of 29.09.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: c73269fa480a8a955f440570fc2fa6c347e3bb3c # HEAD of "stable/mitaka" as of 08.09.2016
neutron_git_install_branch: 664a725142eb34f9e3894a776032caca2e40036a # HEAD of "stable/mitaka" as of 29.09.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: 3cf4a7cffd5f76b9f8a3eed649d04075714dcd9c # HEAD of "stable/mitaka" as of 08.09.2016
neutron_lbaas_git_install_branch: a2d5aed3452cf4d0885051b303ecb51ab1444c1a # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
neutron_vpnaas_git_install_branch: ea355d1bc6e173cd56c6a975b88e5d5e1f901b5c # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
neutron_fwaas_git_install_branch: cbe18b5de196e8edb9b2528a257206c9463c714c # HEAD of "stable/mitaka" as of 29.09.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: 611efbe77c712d9ac35904f659d28dd0f0c1b3ff # HEAD of "stable/mitaka" as of 08.09.2016
nova_git_install_branch: dd30603f91e6fd3d1a4db452f20a51ba8820e1f4 # HEAD of "stable/mitaka" as of 29.09.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 08.09.2016
swift_git_install_branch: d75e6d39789e1cc83ac0614f5f4697e1df2f1f57 # HEAD of "stable/mitaka" as of 29.09.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: a632e9be06ccac382adaade0aafe6340ebe98099 # HEAD of "stable/mitaka" as of 08.09.2016
ironic_git_install_branch: 5a5b3dcafa94868e5f0015d4740e770dca722ad5 # HEAD of "stable/mitaka" as of 29.09.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.4
openstack_release: 13.3.5

# 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==26.1.1
- setuptools==28.0.0
- wheel==0.29.0

## Memcached options
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/add-qemu-conf-d42337dfd42bac6f.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- The os_nova role can now deploy the a custom
/etc/libvirt/qemu.conf file by defining ``qemu_conf_dict``.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- The pip_install_options variable is now honored during repo
building. This variable allows deployers to specify trusted
CA certificates by setting the variable to "--cert
/etc/ssl/certs/ca-certificates.crt"
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
features:
- The ``openstack-ansible-galera_server`` role will now prevent
deployers from changing the ``galera_cluster_name`` variable
on clusters that already have a value set in a running galera
cluster.
You can set the new ``galera_force_change_cluster_name``
variable to ``True`` to force the ``galera_cluster_name``
variable to be changed.
We recommend setting this by running the galera-install.yml playbook
with ``-e galera_force_change_cluster_name=True``, to avoid
changing the ``galera_cluster_name`` variable unintentionally.
Use with caution, changing the ``galera_cluster_name`` value
can cause your cluster to fail, as the nodes won't join if restarted
sequentially.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
features:
- The LXC container creation process now has a configurable
delay for the task which waits for the container to start.
The variable ``lxc_container_ssh_delay`` can be set to
change the default delay of five seconds.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
upgrade:
- New overrides are provided to allow for better customization
around logfile retention and rate limiting for UDP/TCP sockets.
``rsyslog_server_logrotation_window`` defaults to 14 days
``rsyslog_server_ratelimit_interval`` defaults to 0 seconds
``rsyslog_server_ratelimit_burst`` defaults to 10000
- The rsyslog.conf is now using v7+ style configuration settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- The repo_build play now correctly evaluates environment
variables configured in /etc/environment. This enables
deployments in an environment with http proxies.
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==26.1.1 wheel==0.29.0'}
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==28.0.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 a489036

Please sign in to comment.