commit 61abfb08eb091fe7c46892b7c4b6fe7899642fa4
author Filip Pytloun <fpytloun@mirantis.com> Thu Sep 21 11:36:57 2017 +0000
committer Gerrit Code Review <gerrit2@37fca7c923f6> Thu Sep 21 11:36:57 2017 +0000
tree f658a953ab257774b2f2ef2cb0da1fce17e4f80a
parent 4825cdaee4d16e08ac1d3279e864b7e0bc298508
parent 77c8a6f5b88bad8136331c9503e587291b54461e

Merge "Add kernel headers as a dependency for compute"

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 51efa5a..2fc6f70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,13 +23,13 @@
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=control
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=cluster
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=tor
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc311 SUITE=vrouter
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=single
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=analytics
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=control
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=cluster
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=tor
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc323 SUITE=vrouter
   # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=single
   - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=analytics
   - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc323 SUITE=control
@@ -41,7 +41,7 @@
   - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=control40
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=cluster40
   # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=tor40
-  - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=vrouter40
+  # - PLATFORM=trevorj/salty-whales:trusty OC_REPO=oc40 SUITE=vrouter40
   # - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=single40
   - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=analytics40
   - PLATFORM=trevorj/salty-whales:xenial OC_REPO=oc40 SUITE=control40

opencontrail/map.jinja

diff --git a/opencontrail/map.jinja b/opencontrail/map.jinja
index 1fa1c3d..52fe8b3 100644
--- a/opencontrail/map.jinja
+++ b/opencontrail/map.jinja
@@ -38,7 +38,7 @@
 compute:
   Debian:
     pkgs:
-        ['contrail-utils', 'iproute2', 'haproxy']
+        ['contrail-utils', 'iproute2', 'haproxy', '{{ ['linux-headers-', grains.get('kernelrelease')]|join('') }}']
     services:
     {%- if grains.get('init') != 'systemd' or version < 4.0 %}
         ['supervisor-vrouter']
@@ -189,7 +189,7 @@
 compute:
   Debian:
     pkgs:
-         ['contrail-utils', 'iproute2', 'haproxy']
+         ['contrail-utils', 'iproute2', 'haproxy', '{{ ['linux-headers-', grains.get('kernelrelease')]|join('') }}']
     services:
     {%- if grains.get('init') != 'systemd' or version < 4.0 %}
         ['supervisor-vrouter']