SHA Bump post stable/ocata release for upstream

In preparation for OpenStack-Ansible release, this patch performs a SHA
Bump. This lines up with the release of stable/ocata for
cycle-with-intermediary and cycle-with-milestones projects.

Change-Id: Ie67f2d9c5808549d9b44f29e413d7e36c68ff5ba

ansible-role-requirements.yml

@@ -9,15 +9,15 @@
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: 9b3d6fe7976227e1348c942652c05b6d397a598e
+  version: d2768257f0a2361a38d3117ab0c429956920b8d4
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: 1990821a7642557a84cc272a38f2a794f185ff21
+  version: 56368d88b2338a2f76c73c55d9c5b666e0bb73c2
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: 6d4cf3546631357992dc926b44db8cde467ab996
+  version: 055fe624e61a540ccb97e9e13ba03f8d6141fe25
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
@@ -33,7 +33,7 @@
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: 5ce58f009ba2024990f650582df8366c94e5140b
+  version: 4de0af71c22ae05eabd2437cfb83d8ee348bac02
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
@@ -41,7 +41,7 @@
 - name: openstack-ansible-security
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-security
-  version: 08be31ef0e3d29582ad6fe200e2219de3de974c6
+  version: dcad9391b925e74ce2b9bad0a9b56dd62f220ddb
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
@@ -69,15 +69,15 @@
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 570fd59b0c169eeff20a3fb5e41952e255ba4425
+  version: f17350d88c64568a36342e66256f01c9c002c57f
 - name: os_glance
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: d0be4998a8f38fec803f23985f9e3e651165607b
+  version: 7cd3affb0fd7b9c004302eb39fc13e60856b2976
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 0e3d5946be68ded9b41c43a01767a4d03b2c85b4
+  version: 76f8162bcb0fcae493fd481b9074ce038e1db89e
 - 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: a3151e5609677ee8d03e04a5e05c996cd6d6bcf9
+  version: ae6cf338a4a126236918a3c77467ca5132e3b79e
 - 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: 3773fa1037e85638efca55da2325d9194973b9ae
+  version: 1870169ba5704b954bfcc7ef021919ddf14af4b4
 - name: os_trove
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 0cdc8b0fabc4648dbbc42f1a885f82a9f691a042
+  version: 26d2d17472b65f66e36f0c48af303764b35f400b
 - name: os_neutron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: 4cbec8db7884cddc0f8603e23002c83f23b1f4bb
+  version: fa11a46ee33cd0976b07ff90b3232480b7121035
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 345bdce8ab0bc0aa38e9b9ddf55df1fabaefa352
+  version: 43d9388660b529157cf06a9ee0b201c9e572bd20
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
@@ -117,7 +117,7 @@
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 556b2b8897e14c1c9e3befade2096dd4af8e9420
+  version: 16a93e640afd54a114ffcd2d689a998c5a194bb6
 - name: os_tempest
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
@@ -125,7 +125,7 @@
 - name: plugins
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: de6c67092f60c8d2d280d4072747e8ae2bff17ac
+  version: 9a924edd52cae26dd4fe514f85a1c215aa039e18
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server

playbooks/defaults/repo_packages/gnocchi.yml

@@ -33,6 +33,6 @@
 ## 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://git.openstack.org/openstack/gnocchi
-gnocchi_git_install_branch: b3b49c87e866475c149343fd77408bef259c5534 # HEAD of "master" as of 02.02.2017
+gnocchi_git_install_branch: ca27a17a7de6f168f478f150b56b1b8baecc10d0 # HEAD of "stable/3.1" as of 23.02.2017
 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
 gnocchi_git_project_group: gnocchi_all

playbooks/defaults/repo_packages/openstack_services.yml

@@ -31,193 +31,193 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 9d783561dfa404d1302d475953382b746c02423a # HEAD of "stable/ocata" as of 17.02.2017
+requirements_git_install_branch: d60f303693dbac772e12d57f4003bfba3781a87f # HEAD of "stable/ocata" as of 23.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 17.02.2017
+aodh_git_install_branch: e062a0a9966ac69e204cdcfa8b59f51388bd8774 # HEAD of "stable/ocata" as of 23.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: e20d97554cef3a3ea82f53bef15318c72a1d75ae # HEAD of "stable/ocata" as of 17.02.2017
+barbican_git_install_branch: e20d97554cef3a3ea82f53bef15318c72a1d75ae # HEAD of "stable/ocata" as of 23.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: cae2d154d6c6c5daf5976df6698c45fe8046b238 # HEAD of "stable/ocata" as of 17.02.2017
+ceilometer_git_install_branch: 69c7659c6a2583fc4163fce3410bb9ebd4bb07c0 # HEAD of "stable/ocata" as of 23.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: 20fba8389185c166cd879b797ed3548898601c9a # HEAD of "stable/ocata" as of 17.02.2017
+cinder_git_install_branch: ea70d558fb344e3057edc165840f1e3f7fe38bc3 # HEAD of "stable/ocata" as of 23.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: 6b21fa36384401263e87b66b43f00bd34ab828e7 # HEAD of "stable/ocata" as of 17.02.2017
+designate_git_install_branch: 6b21fa36384401263e87b66b43f00bd34ab828e7 # HEAD of "stable/ocata" as of 23.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: 451f0e229ce75649245a129a5a34b0f2dbaf26d8 # HEAD of "stable/ocata" as of 17.02.2017
+designate_dashboard_git_install_branch: 451f0e229ce75649245a129a5a34b0f2dbaf26d8 # HEAD of "stable/ocata" as of 23.02.2017
 designate_dashboard_git_dest: "/opt/designate_dashboard_{{ designate_dashboard_git_install_branch | replace('/', '_') }}"
 designate_dashboard_git_project_group: horizon_all
 
 
 ## Dragonflow service
 dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch:  3018c4db7d827157667559e23f7c27ff48aa4863 # HEAD of "master" as of 23.01.2017
+dragonflow_git_install_branch: 3cfa9ce2ac4d2c350dcdfc77aaef3af9e07744ef # HEAD of "stable/ocata" as of 23.02.2017
 dragonflow_git_dest: "/opt/dragonflow_{{ dragonflow_git_install_branch | replace('/', '_') }}"
 dragonflow_git_project_group: neutron_all
 
 
 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: 13f96bf28cd180c2a39fc87c0d4004ee08a2e05e # HEAD of "stable/ocata" as of 17.02.2017
+glance_git_install_branch: 13f96bf28cd180c2a39fc87c0d4004ee08a2e05e # HEAD of "stable/ocata" as of 23.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: 2dd83353c086a8ee3ee8aefb99b06832782d8cab # HEAD of "stable/ocata" as of 17.02.2017
+heat_git_install_branch: 2dd83353c086a8ee3ee8aefb99b06832782d8cab # HEAD of "stable/ocata" as of 23.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: 30d0a31d41340d0ad340d12db3455156b04e71fc # HEAD of "stable/ocata" as of 17.02.2017
+horizon_git_install_branch: 5a9fbf30d1443fe881fbdbf06aa79b3d299bfbc4 # HEAD of "stable/ocata" as of 23.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: f5c5494e43511102dd481cb1b952004b3d80edc7 # HEAD of "stable/ocata" as of 17.02.2017
+ironic_dashboard_git_install_branch: f5c5494e43511102dd481cb1b952004b3d80edc7 # HEAD of "stable/ocata" as of 23.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: a3f1dc5a81a5cfae142ed08c7d6992f63868a3bc # HEAD of "stable/ocata" as of 17.02.2017
+magnum_dashboard_git_install_branch: b3cb0a4d35361139b30629c4c3e422e3b59bbc63 # HEAD of "stable/ocata" as of 23.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: 565d7d502a03e436e73ac7dcfa046262492e14cf # HEAD of "stable/ocata" as of 17.02.2017
+neutron_lbaas_dashboard_git_install_branch: ce4d03f50bb936017dbf77d20106edde0eadfd6c # HEAD of "stable/ocata" as of 23.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: 2c4f5aa3cca7eb4e9a3a53f5b6f0f8d6c553ca23 # HEAD of "stable/ocata" as of 17.02.2017
+sahara_dashboard_git_install_branch: 2c4f5aa3cca7eb4e9a3a53f5b6f0f8d6c553ca23 # HEAD of "stable/ocata" as of 23.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 17.02.2017
+keystone_git_install_branch: defa49dcd39140f652f7560a3530438105dfc973 # HEAD of "stable/ocata" as of 23.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: 7f7daecb63af8f161a69fc8effe1a5499419a3ad # HEAD of "stable/ocata" as of 17.02.2017
+neutron_git_install_branch: 958388fff0ae69ffb5b95639801c339744706c8e # HEAD of "stable/ocata" as of 23.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 17.02.2017
+neutron_lbaas_git_install_branch: c6011fb279e1c96a6b002423105cb3faced6b11a # HEAD of "stable/ocata" as of 23.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: 6011ca5c2de41c0e6559cf1a091d774d296c8b9a # HEAD of "stable/ocata" as of 17.02.2017
+neutron_vpnaas_git_install_branch: 6011ca5c2de41c0e6559cf1a091d774d296c8b9a # HEAD of "stable/ocata" as of 23.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: 0ee81f541fa0445c64e104730ddee97128cde885 # HEAD of "stable/ocata" as of 17.02.2017
+neutron_fwaas_git_install_branch: 0ee81f541fa0445c64e104730ddee97128cde885 # HEAD of "stable/ocata" as of 23.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 17.02.2017
+neutron_dynamic_routing_git_install_branch: 63b9402e9e8fa625afbf60a3b96e5ba05b109551 # HEAD of "stable/ocata" as of 23.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: ff369899749ac3e21ed0174b40e948c78c2dc1fa # HEAD of "stable/ocata" as of 17.02.2017
+nova_git_install_branch: 10a32ddcf85076266c3ede6e8ca2e9776d64d32e # HEAD of "stable/ocata" as of 23.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: 7759d62b81d89f278e07761a9bd53cfbfc731d00 # HEAD of "stable/ocata" as of 17.02.2017
+nova_powervm_git_install_branch: 7759d62b81d89f278e07761a9bd53cfbfc731d00 # HEAD of "stable/ocata" as of 23.02.2017
 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
 nova_powervm_git_project_group: nova_compute
 
 
 ## LXD Virt Driver
 nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: 6257ebc2edfaf0587ccf40b56acfd66cc6a533cb # HEAD of "stable/ocata" as of 17.02.2017
+nova_lxd_git_install_branch: 2338b7787563c26d2c5a8f3a91a39c99e2334cac # HEAD of "stable/ocata" as of 23.02.2017
 nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}"
 nova_lxd_git_project_group: nova_compute
 
 
 ## Sahara service
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: 5e865d1779b35081d77477d42a6187d991f0090f # HEAD of "stable/ocata" as of 17.02.2017
+sahara_git_install_branch: 5e865d1779b35081d77477d42a6187d991f0090f # HEAD of "stable/ocata" as of 23.02.2017
 sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
 sahara_git_project_group: sahara_all
 
 
 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 968fde53b9e074755d76e5e11e70d68e6e865fc9 # HEAD of "stable/ocata" as of 17.02.2017
+swift_git_install_branch: 968fde53b9e074755d76e5e11e70d68e6e865fc9 # HEAD of "stable/ocata" as of 23.02.2017
 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
 swift_git_project_group: swift_all
 
 
 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: e4ba549f42df9e16ae35cc4c2dca9adfce9c41a7 # HEAD of "stable/ocata" as of 17.02.2017
+ironic_git_install_branch: a13ea4fb2d730236b73bf42479f612e38b9ca9f0 # HEAD of "stable/ocata" as of 23.02.2017
 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
 ironic_git_project_group: ironic_all
 
 ## Magnum service
 magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: 25aa5b06ff7c315c4585bde43b329ba92dfe5707 # HEAD of "master" as of 02.02.2017
+magnum_git_install_branch: 0c7625ff4b7eb27f2ece751fa0475d4babd6d824 # HEAD of "stable/ocata" as of 23.02.2017
 magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}"
 magnum_git_project_group: magnum_all
 
 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: 60e35d16b5d944d708f781271d63ce17df31df4e # HEAD of "stable/ocata" as of 17.02.2017
+trove_git_install_branch: 60e35d16b5d944d708f781271d63ce17df31df4e # HEAD of "stable/ocata" as of 23.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: 27e3dd2b9648bf32346e5bedbdd42de934e4d0f9 # HEAD of "stable/ocata" as of 17.02.2017
+trove_dashboard_git_install_branch: 27e3dd2b9648bf32346e5bedbdd42de934e4d0f9 # HEAD of "stable/ocata" as of 23.02.2017
 trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
 trove_dashboard_git_project_group: horizon_all

releasenotes/notes/capping_cinder_osapi_volume_workers-db32afcf7615b05b.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - Capping the default value for the variable ``cinder_osapi_volume_workers``
+    to 16 when the user doesn't configure this variable. Default value is half
+    the number of vCPUs available on the machine with a capping value of 16.

releasenotes/notes/os-neutron-deprecate-dhcp-domain-63b4c4dfbccd3a3a.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - The variable ``neutron_dhcp_domain`` has been renamed to
+    ``neutron_dns_domain``.

releasenotes/notes/trove_conductor_workers_with_capping-1ea72352813ce530.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - The variable ``trove_conductor_workers`` can be configured for defining
+    the number of workers for the trove conductor service. The default value
+    is half the number of vCPUs available on the machine with a capping
+    value of 16.