Add metadata support for gateway and compute
Without this, Heka isn't properly configured on gateway and compute
nodes.
Change-Id: Ia18df36ea198458828aa5386eb42d386de0eea5e
diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml
index d86284d..e1196b2 100644
--- a/metadata/service/compute/single.yml
+++ b/metadata/service/compute/single.yml
@@ -1,5 +1,7 @@
applications:
- neutron
+classes:
+- service.neutron.support
parameters:
neutron:
compute:
@@ -24,5 +26,3 @@
mechanism:
ovs:
driver: openvswitch
-
-
diff --git a/metadata/service/gateway/single.yml b/metadata/service/gateway/single.yml
index 1e8fa2b..4ff30d1 100644
--- a/metadata/service/gateway/single.yml
+++ b/metadata/service/gateway/single.yml
@@ -1,5 +1,7 @@
applications:
- neutron
+classes:
+- service.neutron.support
parameters:
neutron:
gateway:
diff --git a/neutron/meta/collectd.yml b/neutron/meta/collectd.yml
index 4fb96c5..5afd628 100644
--- a/neutron/meta/collectd.yml
+++ b/neutron/meta/collectd.yml
@@ -1,4 +1,4 @@
-{%- if pillar.neutron.server %}
+{%- if pillar.neutron.server is defined %}
{%- from "neutron/map.jinja" import server with context %}
{%- if server.get('enabled', False) %}
local_plugin: