SHA Bump for roles and upstream projects 15-02-2017

We should try keep as close to stable/ocata as possible before release so when release comes it's a smaller increment. This patch updates the SHA's to the latest stable/ocata role SHA and head of stable/ocata for upstream projects. Additionally, this patch reduces the processes for nova-placement uwsgi app, and drops memory requirements for Galera to alleviate the OOM errors in the gate. Change-Id: Iada1e8d0392a528e0803215109167934b73f5313
2017-02-15 12:02:48 +00:00 · 2017-02-15 12:02:48 +00:00 · af9a97f501
parent 1e50b87b1f
commit af9a97f501
11 changed files with 82 additions and 52 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -5,7 +5,7 @@
 - name: pip_install
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 55afc237cb253c81d135e4def7cbb230e5dbddff
+  version: 82c77283d47aade7d7368a78002b03084deef69f
 - name: galera_client
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
@ -21,7 +21,7 @@
 - name: haproxy_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 8f9ed17cc162bf558699b6daeb7227570706ba06
+  version: d698f0231cb7f01e61709cff5d04040f310745fd
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
@ -41,7 +41,7 @@
 - name: openstack-ansible-security
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: 9b820be2897ea191b9d631966041c9a3d390e211
+  version: 08be31ef0e3d29582ad6fe200e2219de3de974c6
 - name: openstack_hosts
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
@ -49,11 +49,11 @@
 - name: os_keystone
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: 3ab6d4896abb407c46e29373d7a2794cd4b359ac
+  version: c64c50abb301aee7cf1028ff67f48ebf6b8fb826
 - name: openstack_openrc
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: cb4eccd7e9a4c6eab4b0b79ad9204b40a8d2f77f
+  version: 11bfb620174a04b83002f0e4ddf7e78016f498db
 - name: os_aodh
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
@ -61,15 +61,15 @@
 - name: os_barbican
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: 8bc356100b2d45946b6416dcc2f80a2f3b9edd1c
+  version: 595aed6cc1ac0b2a2818167eeadcb491dc1cbaa7
 - name: os_ceilometer
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 6036582e4a00cf86e6957c64cbbf03f2fa397b85
+  version: d016be10d68c5565336e45d2bb7c48a79cc39868
 - name: os_cinder
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 897a04b91886b3e19c89bc97638d1067ceea614f
+  version: ae3f53a8aabf7acfff945985d5f5007e8ab677aa
 - name: os_glance
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
@ -77,7 +77,7 @@
 - name: os_gnocchi
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 1a47948bbd4165d17165ef6c8bcd3b503160d236
+  version: 0e3d5946be68ded9b41c43a01767a4d03b2c85b4
 - name: os_heat
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
@ -85,7 +85,7 @@
 - name: os_horizon
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: 44c68f5ebf8238a5caa329c4d5a6c8239b74b567
+  version: 49a718fd4df4bc043e3c5d3b7516fe12474ef5ff
 - name: os_ironic
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
@ -93,19 +93,19 @@
 - name: os_magnum
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 6468f715dfcd9b0f68f44e11633eecd9c23182e7
+  version: 3773fa1037e85638efca55da2325d9194973b9ae
 - name: os_trove
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 08d9bdeb51dbb66aa6d4f0b5bbfb00c90d121a5e
+  version: 0cdc8b0fabc4648dbbc42f1a885f82a9f691a042
 - name: os_neutron
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: 69e52f0347c0a9497414594e9888af8eabc139b6
+  version: c6f8dce3fd6831a70fee277fbff1208333c690a8
 - name: os_nova
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: c58cc917935c0f8d258b8d71932e26398ceea1d0
+  version: 2ee23940393250cb8424183d3c3b0f24ac93ed61
 - name: os_rally
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
@ -113,19 +113,19 @@
 - name: os_sahara
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: 7d15f8fdde6af495b66b5f213b410756cea237e6
+  version: a7681b96b8321b76b05669ff575a66989d5dc1bb
 - name: os_swift
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 1b785a32c690066e9b238c28b687b0c81cde83d9
+  version: 556b2b8897e14c1c9e3befade2096dd4af8e9420
 - name: os_tempest
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: e35b3a1ca996ce68b5cfa46e57c52228d0a6f6c2
+  version: de866d2436a88a64db9ffd7b5bc3157fb0fd8f51
 - name: plugins
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: 8bc2ffeba14fddcca17b22c6f287753a8fac1d67
+  version: de6c67092f60c8d2d280d4072747e8ae2bff17ac
 - name: rabbitmq_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
@ -133,7 +133,7 @@
 - name: repo_build
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: 64a710dc5d29df1bc8d52ab8e94b7de3f0b4a7e4
+  version: fe3e9a0847df2e8026f5e92af2d508acf9462c76
 - name: repo_server
  scm: git
  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
--- a/global-requirement-pins.txt
+++ b/global-requirement-pins.txt
@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==9.0.1
-setuptools==34.1.1
+setuptools==34.2.0
 wheel==0.29.0
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,141 +31,141 @@

 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 6e4dec002d037e5a7221c4af3a0047e0c530e7db # HEAD of "stable/ocata" as of 10.02.2017
+requirements_git_install_branch: 9d783561dfa404d1302d475953382b746c02423a # HEAD of "stable/ocata" as of 15.02.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: e062a0a9966ac69e204cdcfa8b59f51388bd8774 # HEAD of "stable/ocata" as of 10.02.2017
+aodh_git_install_branch: e062a0a9966ac69e204cdcfa8b59f51388bd8774 # HEAD of "stable/ocata" as of 15.02.2017
 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
 aodh_git_project_group: aodh_all


 ## Barbican service
 barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: d0ebc6c321a840c2d3c8ae5a682d721da7b4a239 # HEAD of "stable/ocata" as of 10.02.2017
+barbican_git_install_branch: e20d97554cef3a3ea82f53bef15318c72a1d75ae # HEAD of "stable/ocata" as of 15.02.2017
 barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch | replace('/', '_') }}"
 barbican_git_project_group: barbican_all


 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: c9afa1c58f8d91dfa6a9febefc3e809847ba03fe # HEAD of "stable/ocata" as of 10.02.2017
+ceilometer_git_install_branch: c9afa1c58f8d91dfa6a9febefc3e809847ba03fe # HEAD of "stable/ocata" as of 15.02.2017
 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}"
 ceilometer_git_project_group: ceilometer_all


 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: e3a2ebdc0ad4da9eb8dec2fa917c1bcdd97cfbf0 # HEAD of "stable/ocata" as of 10.02.2017
+cinder_git_install_branch: 028b52daceec8fb7ebd404526c525f2ccc5e6d87 # HEAD of "stable/ocata" as of 15.02.2017
 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
 cinder_git_project_group: cinder_all


 ## Designate service
 designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: 8c241b7169c9fa152121773e7afa7dcb286f6404 # HEAD of "stable/ocata" as of 10.02.2017
+designate_git_install_branch: edcc6559a9efcdcc886ca095341fbf108d580d5c # HEAD of "stable/ocata" as of 15.02.2017
 designate_git_dest: "/opt/designate_{{ designate_git_install_branch | replace('/', '_') }}"
 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: e36ce465684e3ccee767c33c67458de64e041a59 # HEAD of "stable/ocata" as of 10.02.2017
+designate_dashboard_git_install_branch: 451f0e229ce75649245a129a5a34b0f2dbaf26d8 # HEAD of "stable/ocata" as of 15.02.2017
 designate_dashboard_git_dest: "/opt/designate_dashboard_{{ designate_dashboard_git_install_branch | replace('/', '_') }}"
 designate_dashboard_git_project_group: horizon_all


 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: 81a4cd81a9111a5f8bba2c9e71ae7c7c57473c1a # HEAD of "stable/ocata" as of 10.02.2017
+glance_git_install_branch: 13f96bf28cd180c2a39fc87c0d4004ee08a2e05e # HEAD of "stable/ocata" as of 15.02.2017
 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
 glance_git_project_group: glance_all


 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: 59cad6271724b3578e3a779fb4501fc5175efb34 # HEAD of "stable/ocata" as of 10.02.2017
+heat_git_install_branch: 2b97010ef570483a41048b75c64af8fb1c1755be # HEAD of "stable/ocata" as of 15.02.2017
 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
 heat_git_project_group: heat_all


 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: e95a154963088f7621cf74245383829c0a0fad2d # HEAD of "stable/ocata" as of 10.02.2017
+horizon_git_install_branch: bef9bfe05a89d47de3c5bf0ba9981623ee558fbe # HEAD of "stable/ocata" as of 15.02.2017
 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
 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: 73874c17ff7e7b246e8f864500f5baaa1b5aaca6 # HEAD of "stable/ocata" as of 10.02.2017
+ironic_dashboard_git_install_branch: f5c5494e43511102dd481cb1b952004b3d80edc7 # HEAD of "stable/ocata" as of 15.02.2017
 ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}"
 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: c4e9fa95b320ab497eac70c56e76ced66d4ebb3b # HEAD of "master" as of 02.02.2017
+magnum_dashboard_git_install_branch: 722a867ef0d5e1b7a0247ef5cf835e3398b36388 # HEAD of "stable/ocata" as of 15.02.2017
 magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}"
 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: 816a9d8beffbf727754306a41ac208dd9551b052 # HEAD of "stable/ocata" as of 10.02.2017
+neutron_lbaas_dashboard_git_install_branch: 565d7d502a03e436e73ac7dcfa046262492e14cf # HEAD of "stable/ocata" as of 15.02.2017
 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}"
 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: a61ab520a32af1aac2af6fe71c78b800a7bc7949 # HEAD of "stable/ocata" as of 10.02.2017
+sahara_dashboard_git_install_branch: 2c4f5aa3cca7eb4e9a3a53f5b6f0f8d6c553ca23 # HEAD of "stable/ocata" as of 15.02.2017
 sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}"
 sahara_dashboard_git_project_group: horizon_all


 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: defa49dcd39140f652f7560a3530438105dfc973 # HEAD of "stable/ocata" as of 10.02.2017
+keystone_git_install_branch: defa49dcd39140f652f7560a3530438105dfc973 # HEAD of "stable/ocata" as of 15.02.2017
 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
 keystone_git_project_group: keystone_all


 ## Neutron service
 neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: 7d372b60f88c7834f9c09744c828eed6a6a59456 # HEAD of "stable/ocata" as of 10.02.2017
+neutron_git_install_branch: d0af332bda3d13b50a1548b0e4907784dc43d3ed # HEAD of "stable/ocata" as of 15.02.2017
 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
 neutron_git_project_group: neutron_all

 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: 9f0ca643d7a5a1c4019600e6e5259d266dde4b18 # HEAD of "stable/ocata" as of 10.02.2017
+neutron_lbaas_git_install_branch: 9f0ca643d7a5a1c4019600e6e5259d266dde4b18 # HEAD of "stable/ocata" as of 15.02.2017
 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
 neutron_lbaas_git_project_group: neutron_all

 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: d6db1238a4950df03dfb28acabcf4df14ebfa3ac # HEAD of "master" as of 02.02.2017
+neutron_vpnaas_git_install_branch: 6011ca5c2de41c0e6559cf1a091d774d296c8b9a # HEAD of "stable/ocata" as of 15.02.2017
 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
 neutron_vpnaas_git_project_group: neutron_all

 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: cb87714aa8aa59cce550f7cea10d9d42fa68accd # HEAD of "stable/ocata" as of 10.02.2017
+neutron_fwaas_git_install_branch: cb87714aa8aa59cce550f7cea10d9d42fa68accd # HEAD of "stable/ocata" as of 15.02.2017
 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
 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: 63b9402e9e8fa625afbf60a3b96e5ba05b109551 # HEAD of "stable/ocata" as of 10.02.2017
+neutron_dynamic_routing_git_install_branch: 63b9402e9e8fa625afbf60a3b96e5ba05b109551 # HEAD of "stable/ocata" as of 15.02.2017
 neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}"
 neutron_dynamic_routing_git_project_group: neutron_all


 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: 883d8e8b6119f7eba7efa539e857fc5cec1c0872 # HEAD of "stable/ocata" as of 10.02.2017
+nova_git_install_branch: 9d9b2d78beeabbebaa82b5dfa63dcb67ba49f4e7 # HEAD of "stable/ocata" as of 15.02.2017
 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
 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: 0f65fa459e060c4e401438a7b1cdd6121946e8b8 # HEAD of "stable/ocata" as of 10.02.2017
+nova_powervm_git_install_branch: 0f65fa459e060c4e401438a7b1cdd6121946e8b8 # HEAD of "stable/ocata" as of 15.02.2017
 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
 nova_powervm_git_project_group: nova_compute

@ -179,7 +179,7 @@ nova_lxd_git_project_group: nova_compute

 ## Sahara service
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: d4b91efe683121df91cf257a09f52d9b8f8a9667 # HEAD of "stable/ocata" as of 10.02.2017
+sahara_git_install_branch: 5e865d1779b35081d77477d42a6187d991f0090f # HEAD of "stable/ocata" as of 15.02.2017
 sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
 sahara_git_project_group: sahara_all

@ -193,7 +193,7 @@ swift_git_project_group: swift_all

 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: 217ad9d2c108ba942bbac1428cc6dd33f26ba19d # HEAD of "master" as of 02.02.2017
+ironic_git_install_branch: dd8c23f6b158080c062e27e2a665ad0d719db62c # HEAD of "stable/ocata" as of 15.02.2017
 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
 ironic_git_project_group: ironic_all

@ -205,12 +205,12 @@ magnum_git_project_group: magnum_all

 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: 0faa924ff76649a8cd30681485e2162a4a4c6832 # HEAD of "stable/ocata" as of 10.02.2017
+trove_git_install_branch: 60e35d16b5d944d708f781271d63ce17df31df4e # HEAD of "stable/ocata" as of 15.02.2017
 trove_git_dest: "/opt/trove_{{ trove_git_install_branch | replace('/', '_') }}"
 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: 56918bc947a069730128a9a9a32f86f7408b2c67 # HEAD of "stable/ocata" as of 10.02.2017
+trove_dashboard_git_install_branch: 27e3dd2b9648bf32346e5bedbdd42de934e4d0f9 # HEAD of "stable/ocata" as of 15.02.2017
 trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
 trove_dashboard_git_project_group: horizon_all
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@ -14,7 +14,7 @@
 # limitations under the License.

 ## OpenStack Source Code Release
-openstack_release: master.master.1
+openstack_release: 15.0.0

 ## Verbosity Options
 debug: False
@ -39,7 +39,7 @@ rsyslog_client_package_state: "{{ package_state }}"
 # These pins are updated through the sources-branch-updater script
 pip_packages:
  - pip==9.0.1
-  - setuptools==34.1.1
+  - setuptools==34.2.0
  - wheel==0.29.0

 pip_links:
--- a/releasenotes/notes/ceilometer_gnocci_resources_deprecate-efbce0894cf4e086.yaml
+++ b/releasenotes/notes/ceilometer_gnocci_resources_deprecate-efbce0894cf4e086.yaml
@ -0,0 +1,7 @@
+---
+deprecations:
+  - The ``ceilometer_gnocci_resources_yaml_overrides``
+    variable is deprecated and scheduled for removal
+    in the Pike cycle. This is replaced with the
+    correctly spelled variable, which should now be used
+    ``ceilometer_gnocchi_resources_yaml_overrides``.
--- a/releasenotes/notes/gnocchi_upstream_file_retrieve-e2a056bfc532d761.yaml
+++ b/releasenotes/notes/gnocchi_upstream_file_retrieve-e2a056bfc532d761.yaml
@ -0,0 +1,10 @@
+---
+features:
+  - Several configuration files that were not
+    templated for the ``os_gnocchi` role are now
+    retrieved from git. The git repository used can
+    be changed using the
+    ``gnocchi_git_config_lookup_location`` variable.
+    By default this points to ``git.openstack.org``.
+    These files can still be changed using the
+    ``gnocchi_x_overrides`` variables.
--- a/releasenotes/notes/neutron-dragonflow-support-fce23f85c6a0bebd.yaml
+++ b/releasenotes/notes/neutron-dragonflow-support-fce23f85c6a0bebd.yaml
@ -0,0 +1,7 @@
+---
+features:
+  - The ``dragonflow`` plugin for neutron is now available.
+    You can set the ``neutron_plugin_type`` to
+    ``ml2.dragonflow`` to utilize this code path.
+    The ``dragonflow`` code path is currently
+    experimental.
--- a/releasenotes/notes/remove-uca-rdo-8c625c61eeb9a771.yaml
+++ b/releasenotes/notes/remove-uca-rdo-8c625c61eeb9a771.yaml
@ -0,0 +1,5 @@
+---
+other:
+  - From now on, external repo management (in use for
+    RDO/UCA for example) will be done inside the
+    pip-install role, not in the repo_build role.
--- a/releasenotes/notes/swift-pypy-support-9706519c4b88a571.yaml
+++ b/releasenotes/notes/swift-pypy-support-9706519c4b88a571.yaml
@ -1,7 +1,7 @@
 ---
 features:
-  - While default python interpreter for swift is cpython, pypy is 
-    now an option. This change adds the ability to greatly improve swift 
+  - While the default python interpreter for swift is cpython, pypy is
+    now an option. This change adds the ability to greatly improve swift
    performance without the core code modifications. These changes have
    been implemented using the documentation provided by Intel and
    Swiftstack. `Notes about the performance increase can be seen
--- a/scripts/scripts-library.sh
+++ b/scripts/scripts-library.sh
@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------'
 MAX_RETRIES=${MAX_RETRIES:-5}
 ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False}
 STARTTIME="${STARTTIME:-$(date +%s)}"
-PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==34.1.1 wheel==0.29.0 '}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==34.2.0 wheel==0.29.0 '}
 COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"}

 # The default SSHD configuration has MaxSessions = 10. If a deployer changes
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@ -21,7 +21,7 @@ tempest_public_subnet_cidr: 172.29.248.0/22
 tempest_public_subnet_allocation_pools: "172.29.249.110-172.29.249.200"

 ## Galera settings
-galera_innodb_buffer_pool_size: 512M
+galera_innodb_buffer_pool_size: 256M
 galera_innodb_log_buffer_size: 32M
 galera_wsrep_provider_options:
 - { option: "gcache.size", value: "32M" }
@ -47,6 +47,7 @@ neutron_rpc_workers: 1
 nova_conductor_workers: 2
 nova_metadata_workers: 2
 nova_osapi_compute_workers: 2
+nova_wsgi_processes: 2
 swift_account_server_workers: 2
 swift_container_server_workers: 2
 swift_object_server_workers: 2