Fix for splitted OpenContrail services deployments when neutron is not
running on controller nodes
Some deployments might have neutron service defined on OpenStack
controllers and using contrail as the defined plugin but OpenContrail
service deported on non OpenStack controllers nodes. This fix prevents
errors like:
Rendering SLS 'base:neutron.server' failed: Jinja variable
'salt.utils.context.NamespacedDictWrapper object'
has no attribute 'opencontrail'
/var/cache/salt/minion/files/base/opencontrail/map.jinja(2)
Change-Id: I92300c73cd470d0c40f6826565ff01908bd61ad2
diff --git a/neutron/map.jinja b/neutron/map.jinja
index ede8d16..0eaf45f 100644
--- a/neutron/map.jinja
+++ b/neutron/map.jinja
@@ -63,7 +63,7 @@
{%- if not tmp_server.backend is defined %}
-{%- if tmp_server.plugin == "contrail" %}
+{%- if pillar.opencontrail is defined and tmp_server.plugin == "contrail" %}
{%- from "opencontrail/map.jinja" import config with context %}
diff --git a/neutron/server.sls b/neutron/server.sls
index 370e402..23b439b 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -1,5 +1,5 @@
{%- from "neutron/map.jinja" import server with context %}
-{%- if server.enabled %}
+{%- if server.get('enabled', False) %}
neutron_server_packages:
pkg.installed: