Refactor pkgs for contrail-database and fix kitchen tests

It is useless to specify supervisor in map.jinja because it is already
a dependency for the specified packages
Kitchen tests triggered unwanted tests, it is fixed by changing the name
of the suite.

Change-Id: I526c67095d06001283b5c67e3e43616a8bf4f31a
diff --git a/.kitchen.yml b/.kitchen.yml
index 755b36f..c6d8196 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -56,7 +56,7 @@
 
 suites:
 
-  - name: single
+  - name: single3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/single.sls
@@ -64,7 +64,7 @@
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/single40.sls
-  - name: analytics
+  - name: analytics3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/analytics.sls
@@ -72,7 +72,7 @@
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/analytics40.sls
-  - name: control
+  - name: control3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/control.sls
@@ -80,7 +80,7 @@
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/control40.sls
-  - name: cluster
+  - name: cluster3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/cluster.sls
@@ -88,7 +88,7 @@
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/cluster40.sls
-  - name: tor
+  - name: tor3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/tor.sls
@@ -96,7 +96,7 @@
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/tor40.sls
-  - name: vrouter
+  - name: vrouter3
     provisioner:
       pillars-from-files:
         opencontrail.sls: tests/pillar/vrouter.sls