Merge "Move installation of contrail-nova-driver from nova formula to opencontrail formula"
diff --git a/opencontrail/map.jinja b/opencontrail/map.jinja
index 89c7bc1..7fa87e8 100644
--- a/opencontrail/map.jinja
+++ b/opencontrail/map.jinja
@@ -47,7 +47,13 @@
compute:
Debian:
pkgs:
- ['contrail-utils', 'iproute2', 'haproxy', '{{ ['linux-headers-', grains.get('kernelrelease')]|join('') }}']
+ - contrail-utils
+ - iproute2
+ - haproxy
+ - {{ ['linux-headers-', grains.get('kernelrelease')]|join('') }}
+{%- if pillar.nova is defined and pillar.nova.compute is defined and pillar.nova.compute.get('networking', 'default') == "contrail" and pillar.nova.compute.get('version', 'ocata') not in ["juno", "kilo", "liberty", "mitaka", "newton"] %}
+ - contrail-nova-driver
+{%- endif %}
services:
{%- if version < 4.0 %}
['supervisor-vrouter']