Fix vrouter package dependencies in dpdk and non dpdk

Change-Id: I83e9721bc47cb54b2f4b83f3c98820fe6cdf0c9d
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index ea66e24..53eb3fd 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -88,6 +88,7 @@
   - names:
     - contrail-vrouter-dpdk
     - contrail-vrouter-dpdk-init
+    - contrail-vrouter-agent
   - require_in:
     - pkg: opencontrail_compute_packages
 
@@ -116,7 +117,9 @@
 
 opencontrail_vrouter_package:
   pkg.installed:
-  - name: contrail-vrouter-dkms
+  - names:
+    - contrail-vrouter-dkms
+    - contrail-vrouter-agent
   - require_in:
     - pkg: opencontrail_compute_packages
 
diff --git a/opencontrail/map.jinja b/opencontrail/map.jinja
index 53aee1e..5ff3153 100644
--- a/opencontrail/map.jinja
+++ b/opencontrail/map.jinja
@@ -25,7 +25,7 @@
 
 {% set compute = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['contrail-vrouter-agent', 'contrail-utils', 'iproute2', 'haproxy'],
+        'pkgs': ['contrail-utils', 'iproute2', 'haproxy'],
         'services': ['supervisor-vrouter'],
         'dpdk': {
             'enabled': False