Cleanup + extend tests/pillars
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 583af2b..1d21783 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -7,7 +7,9 @@
     version: liberty
     backend:
       engine: contrail
+      #contrail_discovery_host
       host: 127.0.0.1
+      port: 8082
       user: admin
       password: password
       token: token
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 7d7494c..73529cf 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -3,7 +3,9 @@
     enabled: true
     backend:
       engine: contrail
+      #contrail_discovery_host
       host: 127.0.0.1
+      port: 8082
       user: admin
       password: password
       token: token
@@ -42,4 +44,4 @@
       region: RegionOne
       user: nova
       password: password
-      tenant: service
\ No newline at end of file
+      tenant: service