Pin SHA's for stable/pike rc1

We may need a few more bumps - specifically for some upstream projects that don't have a stable/pike branch yet. Namely: swift magnum magnum_dashboard nova-lxd ceilometer aodh dragonflow We should move to a SHA-bump approach from now to allow us to release RC1 and further RCs without having to re-pin role SHA's. Additionally, since the endpoint for placement has changed to / instead of /placement the healthchk needs to anticipate a "401 - Unauthorized". Change-Id: Iccc4d4b7aa3a69eb3c87e50aaae9ccb7b4b7135e
2017-08-15 10:55:39 +01:00 · 2017-08-15 10:55:39 +01:00 · c4105464e6
commit c4105464e6
parent 76d5931fac
34 changed files with 225 additions and 106 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -1,179 +1,179 @@
 - name: ansible-hardening
  scm: git
  src: https://git.openstack.org/openstack/ansible-hardening
-  version: master
+  version: 20b6d668e88dfb23a57c45330964ec2ac1ae00eb
 - name: apt_package_pinning
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: master
+  version: 5d507c11aaddf7a20d36071307a1a49871b9e82f
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: master
+  version: a4209580d9f02651ba9f94ae1a30eb1c087cdd90
 - name: galera_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: master
+  version: 68ab663a6e8394e13fabb5102361ab1f4e8d6ff5
 - name: galera_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: master
+  version: 5af8a3db86723b889c0b68c809bf321067e4272f
 - name: ceph_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: master
+  version: d4703c606f92be9e71c33728f785cbd76eb76779
 - name: haproxy_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: master
+  version: baf9a2b8a9edac2412582dcbaa57d38f7875e0cf
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
-  version: master
+  version: 3.0.1
 - name: lxc_container_create
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: master
+  version: b5a3d5cd46319017a901245a40172dfa5edca3b6
 - name: lxc_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: master
+  version: 34c018a879175bd521692cc618b53d85368ba8f3
 - name: memcached_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: master
+  version: f55f307156a1493fb71a372125b273664ddf08f9
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: master
+  version: 0e3a6faa13bcfad5e56013da82fa3f7650778dee
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: master
+  version: b1ab60a3504fe2f81e9635e496b1f5963a0e587c
 - name: openstack_openrc
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: master
+  version: e313c5a138c2b05637330c8d9385b03df4ac920a
 - name: os_aodh
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: master
+  version: 597fe05c539f535c8d73ebb71a6e35996decd685
 - name: os_barbican
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: master
+  version: 8900c7f6e463afd07737ad9f54b57927fdc9922a
 - name: os_ceilometer
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: master
+  version: f2653a64f8a598a8e555a7b36f006cf4967082ec
 - name: os_cinder
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: master
+  version: 0d0527e8f8d490c65b74981247f6df6f9b7770e7
 - name: os_glance
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: master
+  version: 01cbd0805dc12bbc5e999e398f67dcb4b9b5e44d
 - name: os_gnocchi
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: master
+  version: 986b6d862f8c4330859a2f88f201703991e47466
 - name: os_heat
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: master
+  version: ccb8cb6f8d35c955996bb596e059e7d2d829e926
 - name: os_horizon
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: master
+  version: 05781db933ddcfd58503df09656c1c3822fa3543
 - name: os_ironic
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: master
+  version: c4506a6aac72b6705377988548394d5ba7af1f13
 - name: os_magnum
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: master
+  version: f18df2927ce786847d93e75f6580bcde28c1073f
 - name: os_trove
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: master
+  version: 2d343e8bcfcddf7d8f522d238aff75101e7ec573
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: master
+  version: a5357ecac5d25e9623e2dbf6fc2130454160cb41
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: master
+  version: 7f57d8110b9f6b5fede9e777b415e6ed082a4d06
 - name: os_rally
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: master
+  version: 67a3b84c99b2a4152302f6ca867f00ae96bb5048
 - name: os_sahara
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: master
+  version: 55f437b447d8d55c357f4b80b03d813063088a55
 - name: os_swift
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: master
+  version: 4bd2bea7ece859d63d3f1ec2715ae4ea64ecded3
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: master
+  version: cf3e435185b330eda79bc5d18207bdf601163cb2
 - name: plugins
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: master
+  version: 5daef9244567c41f0faa02ac14a4666163b36323
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: master
+  version: 9edd9e72d60cbcb2151a11700496667b07552b0d
 - name: repo_build
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: master
+  version: 18b165c5dcebd7b1691fc00d76d097d002111fe4
 - name: repo_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: master
+  version: 1014cdc40731ff32bf423f0a9ea1bb702a4d7224
 - name: rsyslog_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: master
+  version: 3af4a3e7a953558ad60c57da87e483436f2c18e8
 - name: rsyslog_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: master
+  version: b797bcb8b7fc875025dd6240d3c3fb9b7383b1c4
 - name: sshd
  scm: git
  src: https://github.com/willshersystems/ansible-sshd
-  version: master
+  version: 0.5.1
 - name: bird
  scm: git
  src: https://github.com/logan2211/ansible-bird
-  version: master
+  version: '1.3'
 - name: etcd
  scm: git
  src: https://github.com/logan2211/ansible-etcd
-  version: master
+  version: '1.2'
 - name: unbound
  scm: git
  src: https://github.com/logan2211/ansible-unbound
-  version: master
+  version: '1.5'
 - name: resolvconf
  scm: git
  src: https://github.com/logan2211/ansible-resolvconf
-  version: master
+  version: '1.3'
 - name: os_designate
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: master
+  version: 8b83e3d10258f51eae41c01c811f2070a87b1b31
 - name: ceph.ceph-common
  scm: git
  src: https://github.com/ceph/ansible-ceph-common
-  version: 41b7be03dec81e16502386ef17b7af96db6f0d6f
+  version: v2.2.9
 - name: ceph.ceph-docker-common
  scm: git
  src: https://github.com/ceph/ansible-ceph-docker-common
@ -181,16 +181,16 @@
 - name: ceph-mon
  scm: git
  src: https://github.com/ceph/ansible-ceph-mon
-  version: 235ea7526a2bb621317b5263f3841deef7ab49e6
+  version: v2.2.9
 - name: ceph-osd
  scm: git
  src: https://github.com/ceph/ansible-ceph-osd
-  version: 3d4fceb960fbaa0331b965d0a9a4f3511022b86b
+  version: v2.2.9
 - name: os_octavia
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: master
+  version: 205fcc83a64f49eb2eb29f24c39b619743021624
 - name: os_molteniron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: master
+  version: da5034d9c3bd93ed6effed587cc89c4204750de2
--- a/group_vars/all/haproxy.yml
+++ b/group_vars/all/haproxy.yml
@ -151,6 +151,8 @@ haproxy_default_services:
      haproxy_balance_type: http
      haproxy_backend_options:
        - "httpchk HEAD /"
+      haproxy_backend_httpcheck_options:
+        - "expect status 401"
  - service:
      haproxy_service_name: nova_console
      haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/playbooks/defaults/repo_packages/gnocchi.yml
@ -33,5 +33,5 @@
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
 gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
-gnocchi_git_install_branch: 47d7cdd765b39c7773ca5f5d987b4e38cd403fd9 # HEAD of "master" as of 24.07.2017
+gnocchi_git_install_branch: 70555bf48b05339d326fe2ccaa021cd21573dd81 # HEAD of "master" as of 15.08.2017
 gnocchi_git_project_group: gnocchi_all
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/playbooks/defaults/repo_packages/nova_consoles.yml
@ -27,11 +27,11 @@

 ## NOVNC from source
 novncproxy_git_repo: https://github.com/novnc/noVNC
-novncproxy_git_install_branch: edb7879927c18dd2aaf3b86c99df69ba4fbb0eab # HEAD of "master" as of 24.07.2017
+novncproxy_git_install_branch: b5c982ea4207a711a6d335019eb890ac9c3a538c # HEAD of "master" as of 15.08.2017
 novncproxy_git_project_group: nova_console

 ## spice-html5 from source
 spicehtml5_git_repo: https://github.com/SPICE/spice-html5
-spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 24.07.2017
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 15.08.2017
 spicehtml5_git_project_group: nova_console

--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,182 +31,182 @@

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 2b345fcc06f4f06af224aacb5b7e0f942bd07c41 # HEAD of "master" as of 24.07.2017
+requirements_git_install_branch: 02c1576d1307ccfc851d86098465b26e125d38a0 # HEAD of "stable/pike" as of 15.08.2017


 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: ad00e3a52a3ba465f80fc39c7af2e604b4015b68 # HEAD of "master" as of 24.07.2017
+aodh_git_install_branch: cb90d3ad472bba8d648803ca94a9196dff97f0e8 # HEAD of "master" as of 15.08.2017
 aodh_git_project_group: aodh_all


 ## Barbican service
 barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: fdfa516a67fd845ccaf78af2e13c1653f860f842 # HEAD of "master" as of 24.07.2017
+barbican_git_install_branch: e6c4f8cd7363f6662c30b276140fb2b8c9132326 # HEAD of "stable/pike" as of 15.08.2017
 barbican_git_project_group: barbican_all


 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: de8fc6ff1dfbc371ac3ff0b6f4ce61d9ee67a881 # HEAD of "master" as of 24.07.2017
+ceilometer_git_install_branch: 3de27d2855479dbadf9f1146fb1a122968dcfb1e # HEAD of "master" as of 15.08.2017
 ceilometer_git_project_group: ceilometer_all


 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 212b045a022ddd4cf4596e6175aee113792c4e3b # HEAD of "master" as of 24.07.2017
+cinder_git_install_branch: 2e03e0953cc43508d27fc51f12e0d8685cf93480 # HEAD of "stable/pike" as of 15.08.2017
 cinder_git_project_group: cinder_all


 ## Designate service
 designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: accd70a656ef229a085850d358d8a4025cc3ccd2 # HEAD of "master" as of 24.07.2017
+designate_git_install_branch: edc0684ace513d2ae73f06941e0898d1e963f298 # HEAD of "stable/pike" as of 15.08.2017
 designate_git_project_group: designate_all


 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: 19b1f1c42177b067a3ec598947c0e8f263d11b88 # HEAD of "master" as of 24.07.2017
+designate_dashboard_git_install_branch: 8169c4b876e05f0675a1d942b17d7d83b9f9e7d2 # HEAD of "stable/pike" as of 15.08.2017
 designate_dashboard_git_project_group: horizon_all


 ## Dragonflow service
 dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: 7ed19f887b132ab095191531813186cfac794f1e # HEAD of "master" as of 24.07.2017
+dragonflow_git_install_branch: 4ef8522cbac0362849eba14d796ccd04a2f9d222 # HEAD of "master" as of 15.08.2017
 dragonflow_git_project_group: neutron_all


 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: adb219cf4570dc5ff36b49b84988d4773ed71d6b # HEAD of "master" as of 24.07.2017
+glance_git_install_branch: e612a90092edc619c93324d3f5334243c64571be # HEAD of "stable/pike" as of 15.08.2017
 glance_git_project_group: glance_all


 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: aa5c44beeb95f6d228ab6d03a6e9386492d008d6 # HEAD of "master" as of 24.07.2017
+heat_git_install_branch: 22d71422b12a953626fafa6b87d4ace004590b7b # HEAD of "stable/pike" as of 15.08.2017
 heat_git_project_group: heat_all


 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: 9cca6d0a502290d101f547d9d768161f4b928b4d # HEAD of "master" as of 24.07.2017
+horizon_git_install_branch: f006b739c9f12c2ef58ffe9c7ee6b78ba73c54a0 # HEAD of "stable/pike" as of 15.08.2017
 horizon_git_project_group: horizon_all

 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 9c9a298aa84f7fdf66510b56822d61c68c76a185 # HEAD of "master" as of 24.07.2017
+ironic_dashboard_git_install_branch: 8a94404e48634505c29bfa6f1cc650721e139649 # HEAD of "stable/pike" as of 15.08.2017
 ironic_dashboard_git_project_group: horizon_all

 ## Horizon Magnum dashboard plugin
 magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: c4c266f07c737624f861b965cd56742fa1c49523 # HEAD of "master" as of 24.07.2017
+magnum_dashboard_git_install_branch: 95f43811c397282a76dabb374fd88cae5e9e8c37 # HEAD of "master" as of 15.08.2017
 magnum_dashboard_git_project_group: horizon_all

 ## Horizon LBaaS dashboard plugin
 neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
-neutron_lbaas_dashboard_git_install_branch: 34bc1ed1de2de56b0caf2de5801ba7b5accc3c9c # HEAD of "master" as of 25.07.2017
+neutron_lbaas_dashboard_git_install_branch: 9c8c2ff2c715121913c73601dbc42d9d365c1e9f # HEAD of "stable/pike" as of 15.08.2017
 neutron_lbaas_dashboard_git_project_group: horizon_all

 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: 9a92bcd3b708cae3ffd1015e007371574ed8537f # HEAD of "master" as of 24.07.2017
+sahara_dashboard_git_install_branch: 58e09e31949aa87b45c11d1f8aaa1c0a9eea9be6 # HEAD of "stable/pike" as of 15.08.2017
 sahara_dashboard_git_project_group: horizon_all


 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: 7c3acf34fada67fd86442c1882954e903a335fd0 # HEAD of "master" as of 24.07.2017
+keystone_git_install_branch: e45e77170329f8af0f4d479838bfc69fa9f19014 # HEAD of "stable/pike" as of 15.08.2017
 keystone_git_project_group: keystone_all


 ## Neutron service
 neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: 65720ff5aac263f09bc762d0cedd047571115e72 # HEAD of "master" as of 24.07.2017
+neutron_git_install_branch: 2f98022fa5fc5fd61cd441469b7fe65c0ae12b23 # HEAD of "stable/pike" as of 15.08.2017
 neutron_git_project_group: neutron_all

 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: f32a0ec5bd9c45685f498afbbd03fb554f96eb9e # HEAD of "master" as of 24.07.2017
+neutron_lbaas_git_install_branch: b8a806e923df9b59284053d4bd801ebf47a3b762 # HEAD of "stable/pike" as of 15.08.2017
 neutron_lbaas_git_project_group: neutron_all

 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 797c0466693108dd63415a065750e7a62a5f5ce8 # HEAD of "master" as of 24.07.2017
+neutron_vpnaas_git_install_branch: 8278615c1f35f98447a3f9692a78ab45e90ee8c6 # HEAD of "stable/pike" as of 15.08.2017
 neutron_vpnaas_git_project_group: neutron_all

 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: cdd283a3471e92dc47aeb251c08ce000a2a04aa2 # HEAD of "master" as of 24.07.2017
+neutron_fwaas_git_install_branch: a6b0f95241cf313527a57a50bb4d15755a2dc396 # HEAD of "stable/pike" as of 15.08.2017
 neutron_fwaas_git_project_group: neutron_all

 neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: d8c2c9e56253e8f6a7995995e5fac50abf56a3c6 # HEAD of "master" as of 24.07.2017
+neutron_dynamic_routing_git_install_branch: acf24970687cc5fcc64f2b7a7058230eb4f18b37 # HEAD of "stable/pike" as of 15.08.2017
 neutron_dynamic_routing_git_project_group: neutron_all

 networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
-networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 24.07.2017
+networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 15.08.2017
 networking_calico_git_project_group: neutron_all

 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: 321f426c30f8f4f6e3dcafbbc7e5d87560b58c82 # HEAD of "master" as of 24.07.2017
+nova_git_install_branch: fefff942ef5f8b3b8b209be1554daba28865d73a # HEAD of "stable/pike" as of 15.08.2017
 nova_git_project_group: nova_all


 ## PowerVM Virt Driver
 nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
-nova_powervm_git_install_branch: 4f2ef146a877e30e47cf72369e818c92fc0ce2f9 # HEAD of "master" as of 24.07.2017
+nova_powervm_git_install_branch: 8ee60c5588a99a77a7951eaec0663664a7db6df1 # HEAD of "stable/pike" as of 15.08.2017
 nova_powervm_git_project_group: nova_all


 ## LXD Virt Driver
 nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: 78b6c14f2cf375493f3fc268d589f2ba23f4f346 # HEAD of "master" as of 24.07.2017
+nova_lxd_git_install_branch: 9307fcc2080e0103721f44f8f47d286ffb58ac0f # HEAD of "master" as of 15.08.2017
 nova_lxd_git_project_group: nova_all


 ## Sahara service
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: c83983f594eab5839834436f271f7fd6892c2ce3 # HEAD of "master" as of 24.07.2017
+sahara_git_install_branch: e0fd97cbd3bcba594bc95655f57ce6e31fc6916a # HEAD of "stable/pike" as of 15.08.2017
 sahara_git_project_group: sahara_all


 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: d40c9ed3a2c8706ef1394f99a789f036645bfaa3 # HEAD of "master" as of 24.07.2017
+swift_git_install_branch: f9cacb37409d2d7aab03ef5f2aab5038cc283377 # HEAD of "master" as of 15.08.2017
 swift_git_project_group: swift_all


 ## Swift3 middleware
 swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
-swift_swift3_git_install_branch: a8bbdd66464b735a247159ee6c68e0d71bcf27d6 # HEAD of "master" as of 24.07.2017
+swift_swift3_git_install_branch: b4c2590ade19475458e24dabc2729ed3bbb22242 # HEAD of "master" as of 15.08.2017
 swift_swift3_git_project_group: swift_all


 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: 11e79b921457a9b239bf0d771716a089c0683b69 # HEAD of "master" as of 24.07.2017
+ironic_git_install_branch: aa1abbdcd60ebbf221b7b7af589c2f85a940382f # HEAD of "master" as of 15.08.2017
 ironic_git_project_group: ironic_all

 ## Magnum service
 magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: ffe2ea4baa6b91f169ff1a412531b9c4851efe2f # HEAD of "master" as of 24.07.2017
+magnum_git_install_branch: 9eaea84686a6bda09944d32b8f36ed52560894e2 # HEAD of "master" as of 15.08.2017
 magnum_git_project_group: magnum_all

 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: fa171bd3e92d7d7b9032fc035f554dcb4621ce94 # HEAD of "master" as of 24.07.2017
+trove_git_install_branch: 0fb67d459baa0fb22391b1b1da3dba5349666bb7 # HEAD of "stable/pike" as of 15.08.2017
 trove_git_project_group: trove_all

 ## Horizon Trove dashboard plugin
 trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: e1a1fa462191291f121059816df3908ddb791569 # HEAD of "master" as of 24.07.2017
+trove_dashboard_git_install_branch: 387c3358555ee539f7abbbf4875497497e12c265 # HEAD of "stable/pike" as of 15.08.2017
 trove_dashboard_git_project_group: horizon_all

 ## Octavia service
 octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: 73d4f356e48207b26e358489b02c40ebb2c7194f # HEAD of "master" as of 24.07.2017
+octavia_git_install_branch: 02926d8907335a4108998034bafb757418f4b5ac # HEAD of "stable/pike" as of 15.08.2017
 octavia_git_project_group: octavia_all

 ## Molteniron service
 molteniron_git_repo: https://git.openstack.org/openstack/molteniron
-molteniron_git_install_branch: 6eb00df34c25e156197b9b03f428cc5ef028b649 # HEAD of "master" as of 24.07.2017
+molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 15.08.2017
 molteniron_git_project_group: molteniron_all
--- a/playbooks/defaults/repo_packages/openstack_testing.yml
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@ -27,13 +27,13 @@

 ## Tempest service
 tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: 2a1271b924f2297cd0351542d3c4a0fc6a54ac4f # HEAD of "master" as of 24.07.2017
+tempest_git_install_branch: e56964dfbe6bca0c3acee7891111d9e12d0cc4e2 # HEAD of "master" as of 15.08.2017
 tempest_git_project_group: utility_all
 tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True"


 ## Rally service
 rally_git_repo: https://git.openstack.org/openstack/rally
-rally_git_install_branch: 196d17737753eb6de7291140a9d5f249157b50ad # HEAD of "master" as of 24.07.2017
+rally_git_install_branch: 8d2faecc098130bc3c0c69fb0e610aeac6bc6c0b # HEAD of "master" as of 15.08.2017
 rally_git_project_group: utility_all
 rally_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
--- a/releasenotes/notes/add-iptables-5ff8c4317e2e8498.yaml
+++ b/releasenotes/notes/add-iptables-5ff8c4317e2e8498.yaml
@ -2,7 +2,7 @@
 features:
  - Simplifies configuration of lbaas-mgmt network.

-  - Adds iptables rules to block taffic from the octavia management network to
+  - Adds iptables rules to block taffic from the octavia managment network to
    the octavia container for both ipv4 and ipv6.


--- a/releasenotes/notes/aodh-init-config-overrides-f152b8fd098efb0d.yaml
+++ b/releasenotes/notes/aodh-init-config-overrides-f152b8fd098efb0d.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the aodh systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/barbican-init-config-overrides-ffce7e419061c4da.yaml
+++ b/releasenotes/notes/barbican-init-config-overrides-ffce7e419061c4da.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the barbican systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/ceilometer-init-config-overrides-bfce7e419061c4da.yaml
+++ b/releasenotes/notes/ceilometer-init-config-overrides-bfce7e419061c4da.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the ceilometer systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/ceph-extra-components-71f1c130b9b47ba5.yaml
+++ b/releasenotes/notes/ceph-extra-components-71f1c130b9b47ba5.yaml
@ -0,0 +1,6 @@
+---
+features:
+  - |
+    A new variable called ``ceph_extra_components`` is available for the
+    ceph_client role. Extra components, packages, and services that are not
+    shipped by default by OpenStack-Ansible can be defined here.
--- a/releasenotes/notes/cinder-init-config-overrides-9e495aee023deed6.yaml
+++ b/releasenotes/notes/cinder-init-config-overrides-9e495aee023deed6.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the cinder systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/cinder_uwsgi-c6a1651a4c54a8cc.yaml
+++ b/releasenotes/notes/cinder_uwsgi-c6a1651a4c54a8cc.yaml
@ -0,0 +1,15 @@
+---
+features:
+  - The ``cinder-api`` service has moved to run as a
+    uWSGI application. You can set the max number of
+    WSGI processes, the number of processes, threads,
+    and buffer size utilizing the
+    ``cinder_wsgi_processes_max``,
+    ``cinder_wsgi_processes``, ``cinder_wsgi_threads``,
+    and ``cinder_wsgi_buffer_size``.
+    Additionally, you can override any settings in the
+    uWSGI ini configuration file using the
+    ``cinder_api_uwsgi_ini_overrides`` setting.
+    The uWSGI application will listen on the address
+    specified by ``cinder_uwsgi_bind_address`` which
+    defaults to ``0.0.0.0``.
--- a/releasenotes/notes/glance-init-config-overrides-d1c8c3dcc50c109a.yaml
+++ b/releasenotes/notes/glance-init-config-overrides-d1c8c3dcc50c109a.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the glance systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/glance_uwsgi-dd5fe62e6f85ecd2.yaml
+++ b/releasenotes/notes/glance_uwsgi-dd5fe62e6f85ecd2.yaml
@ -0,0 +1,12 @@
+---
+features:
+  - The ``glance-api`` service has moved to run as a
+    uWSGI application. You can set the max number of WSGI
+    processes, the number of processes, threads, and
+    buffer size utilizing the
+    ``glance_wsgi_processes_max``,
+    ``glance_wsgi_processes``, ``glance_wsgi_threads``,
+    and ``glance_wsgi_buffer_size``.
+    Additionally, you can override any settings in the
+    uWSGI ini configuration file using the
+    ``glance_api_uwsgi_ini_overrides`` setting.
--- a/releasenotes/notes/gnocchi-init-config-overrides-4fc9ec27ea1bd090.yaml
+++ b/releasenotes/notes/gnocchi-init-config-overrides-4fc9ec27ea1bd090.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the gnocchi systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/heat-init-config-overrides-004872081661a34c.yaml
+++ b/releasenotes/notes/heat-init-config-overrides-004872081661a34c.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the heat systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/heat_uwsgi-11d691aa4d47c35d.yaml
+++ b/releasenotes/notes/heat_uwsgi-11d691aa4d47c35d.yaml
@ -0,0 +1,20 @@
+---
+features:
+  - The ``heat-api``, ``heat-api-cfn``, and
+    ``heat-api-cloudwatch`` services have moved to run
+    as a uWSGI applications. You can set the max number
+    of WSGI processes, the number of processes, threads,
+    and buffer size utilizing the
+    ``heat_wsgi_processes_max``,
+    ``heat_wsgi_processes``, ``heat_wsgi_threads``,
+    and ``heat_wsgi_buffer_size``.
+    Additionally, you can override any settings in the
+    uWSGI ini configuration file using the
+    ``heat_api_uwsgi_ini_overrides``,
+    ``heat_api_cfn_uwsgi_ini_overrides``, and
+    ``heat_api_cloudwatch_uwsgi_ini_overrides`` settings.
+    The uWSGI applications will listen on the addresses
+    specified by ``heat_api_uwsgi_bind_address``,
+    ``heat_api_cfn_uwsgi_bind_address``, and
+    ``heat_api_cloudwatch_uwsgi_bind_address``
+    respectively. Which all default to ``0.0.0.0``.
--- a/releasenotes/notes/ironic-init-config-overrides-e73d9fd46a69afcf.yaml
+++ b/releasenotes/notes/ironic-init-config-overrides-e73d9fd46a69afcf.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the ironic systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/keystone-init-config-overrides-1857d5e5bc5a905f.yaml
+++ b/releasenotes/notes/keystone-init-config-overrides-1857d5e5bc5a905f.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the keystone systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/magnum-init-config-overrides-aec21cbbd9da8e4e.yaml
+++ b/releasenotes/notes/magnum-init-config-overrides-aec21cbbd9da8e4e.yaml
@ -5,5 +5,5 @@ features:
  - The task dropping the magnum systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.
--- a/releasenotes/notes/move-gnocchi-component-118ae07fce3562e1.yaml
+++ b/releasenotes/notes/move-gnocchi-component-118ae07fce3562e1.yaml
@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    The gnocchi ceph component has been moved out as a default component
+    required by the ceph_client role. It can now be optionally specified
+    through the use of the ``ceph_extra_components`` variable.
--- a/releasenotes/notes/neutron-init-config-overrides-9d1d2b3b908705ed.yaml
+++ b/releasenotes/notes/neutron-init-config-overrides-9d1d2b3b908705ed.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the neutron systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/nova-init-config-overrides-7221a8f9d5be9291.yaml
+++ b/releasenotes/notes/nova-init-config-overrides-7221a8f9d5be9291.yaml
@ -5,5 +5,5 @@ features:
  - The task dropping the nova systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.
--- a/releasenotes/notes/nova-init-config-overrides-ffce7e419061c4da.yaml
+++ b/releasenotes/notes/nova-init-config-overrides-ffce7e419061c4da.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the designate systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/nova_uwsgi-af062fa20317d41c.yaml
+++ b/releasenotes/notes/nova_uwsgi-af062fa20317d41c.yaml
@ -0,0 +1,23 @@
+---
+features:
+  - The ``nova-api``, and ``nova-metadata``  services
+    have moved to run as uWSGI applications. You can
+    override their uwsgi configuration files using the
+    ``nova_api_os_compute_uwsgi_ini_overrides``, and
+    ``nova_api_metadata_uwsgi_ini_overrides`` settings.
+upgrade:
+  - The ``nova-placement`` service now runs as a uWSGI
+    application that is not fronted by an nginx
+    web-server by default. After upgrading, if the
+    ``nova-placement`` service was running on a host
+    or container without any other services requiring
+    nginx, you should manually remove nginx.
+deprecations:
+  - Settings related to nginx and the placement
+    will no longer serve any purpose, and should
+    be removed. Those settings are as follows -
+    ``nova_placement_nginx_access_log_format_extras``,
+    ``nova_placement_nginx_access_log_format_combined``,
+    ``nova_placement_nginx_extra_conf``,
+    ``nova_placement_uwsgi_socket_port``, and
+    ``nova_placement_pip_packages``.
--- a/releasenotes/notes/octavia-init-config-overrides-554491baa2e97102.yaml
+++ b/releasenotes/notes/octavia-init-config-overrides-554491baa2e97102.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the octavia systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/octavia_uwsgi-f5d10fec3c1950bf.yaml
+++ b/releasenotes/notes/octavia_uwsgi-f5d10fec3c1950bf.yaml
@ -0,0 +1,15 @@
+---
+features:
+  - The ``octavia-api`` service has moved to run as a
+    uWSGI application. You can set the max number of
+    WSGI processes, the number of processes, threads,
+    and buffer size utilizing the
+    ``octavia_wsgi_processes_max``,
+    ``octavia_wsgi_processes``, ``octavia_wsgi_threads``,
+    and ``octavia_wsgi_buffer_size``.
+    Additionally, you can override any settings in the
+    uWSGI ini configuration file using the
+    ``octavia_api_uwsgi_ini_overrides`` setting.
+    The uWSGI application will listen on the address
+    specified by ``octavia_uwsgi_bind_address`` which
+    defaults to ``0.0.0.0``.
--- a/releasenotes/notes/remove_rpc_backend-a9832d7699ef1245.yaml
+++ b/releasenotes/notes/remove_rpc_backend-a9832d7699ef1245.yaml
@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Remove ``designate_rpc_backend`` option due to deprecation of
+    rpc_backend option in oslo.messaging.
--- a/releasenotes/notes/sahara-init-config-overrides-4c35b88618b0d0b4.yaml
+++ b/releasenotes/notes/sahara-init-config-overrides-4c35b88618b0d0b4.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the sahara systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/sahara_uwsgi-41e7e0a91a3f8c33.yaml
+++ b/releasenotes/notes/sahara_uwsgi-41e7e0a91a3f8c33.yaml
@ -0,0 +1,15 @@
+---
+features:
+  - The ``sahara-api`` service has moved to run as a
+    uWSGI application. You can set the max number of
+    WSGI processes, the number of processes, threads,
+    and buffer size utilizing the
+    ``sahara_wsgi_processes_max``,
+    ``sahara_wsgi_processes``, ``sahara_wsgi_threads``,
+    and ``sahara_wsgi_buffer_size``.
+    Additionally, you can override any settings in the
+    uWSGI ini configuration file using the
+    ``sahara_api_uwsgi_ini_overrides`` setting.
+    The uWSGI application will listen on the address
+    specified by ``sahara_uwsgi_bind_address`` which
+    defaults to ``0.0.0.0``.
--- a/releasenotes/notes/swift-init-config-overrides-822ec734e02a0dd1.yaml
+++ b/releasenotes/notes/swift-init-config-overrides-822ec734e02a0dd1.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the swift systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/releasenotes/notes/trove-init-config-overrides-a78ed428a32adef8.yaml
+++ b/releasenotes/notes/trove-init-config-overrides-a78ed428a32adef8.yaml
@ -5,6 +5,6 @@ features:
  - The task dropping the trove systemd unit files now uses the
    ``config_template`` action plugin allowing deployers access to
    customize the unit files as they see fit without having to
-    load extra options into the defaults and pollute the generic
+    load extra options into the defaults and polute the generic
    systemd unit file with jinja2 variables and conditionals.

--- a/scripts/sources-branch-updater-lib.sh
+++ b/scripts/sources-branch-updater-lib.sh
@ -174,7 +174,7 @@ sync_roles_and_packages() {
        fi

        # post-sync user hook
-        post_sync_hook ${repo_name} ${os_branch} ${osa_branch} ${repo_address}
+        osa_post_sync_hook ${repo_name} ${os_branch} ${osa_branch} ${repo_address}

        osa_helper_cleanup_files ${osa_repo_tmp_path} ${os_repo_tmp_path}
      fi