summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hope-Morley <edward.hope-morley@canonical.com>2017-11-09 19:00:26 +0000
committerEdward Hope-Morley <edward.hope-morley@canonical.com>2017-11-09 21:30:51 +0000
commite824e45ed28c21c182d879831ab19c1a36e9a58b (patch)
treea19a20bc8c4a882024df8078a78c0a937e7ad1ab
parent0ab4dff2780dc4064e31fc49090c20be9a1dfe3a (diff)
Ensure enabled_filters are in [filter_scheduler]
For >= Ocata the nova.conf template is adding filters to an incorrect section unless additional filters are defined due to a typo in the template. This patch ensures that filters are always set in the [filter_scheduler] section. Change-Id: Iad5d830dd530ea27ddd3b92a39c15524e48af0aa Closes-Bug: 1731319
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+2: Edward Hope-Morley <edward.hope-morley@canonical.com> Workflow+1: Edward Hope-Morley <edward.hope-morley@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 09 Nov 2017 22:24:21 +0000 Reviewed-on: https://review.openstack.org/518780 Project: openstack/charm-nova-cloud-controller Branch: refs/heads/master
-rw-r--r--templates/ocata/nova.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index 5e8cc8a..92019dc 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -174,8 +174,8 @@ memcache_servers = {{ memcached_servers }}
174# relation 174# relation
175discover_hosts_in_cells_interval = 30 175discover_hosts_in_cells_interval = 30
176 176
177{% if additional_neutron_filters is defined %}
178[filter_scheduler] 177[filter_scheduler]
178{% if additional_neutron_filters is defined %}
179enabled_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }} 179enabled_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
180{% else %} 180{% else %}
181enabled_filters = {{ scheduler_default_filters }} 181enabled_filters = {{ scheduler_default_filters }}