commit 65baceb261e27f4fda19ac0a2850ee14072d9e15
author Matthew Mosesohn <mmosesohn@mirantis.com> Wed Jun 21 17:33:27 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Mon Jun 26 18:21:04 2017 +0300
tree e19812f107f6377c9b11dd4ff789c6116c477024
parent dc241dc0d060566e36dc2da6f15a9ad133ecd904

Add contrail linklocal for apiserver

Disables dashboard by default because of missing params
for endpoint. Will fix in the future.

Also fix ref to contrail apiserver in CNI

Change-Id: I98c429fd2435a1985bdce3afe613f63cc3492f16

tests/pillar/master_cluster.sls

diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 9c5dca0..29a3306 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -42,6 +42,7 @@
       name: node040
     apiserver:
       address: 10.0.175.100
+      internal_address: 182.22.97.1
       insecure_address: 127.0.0.1
       insecure_port: 8080
     ca: kubernetes

tests/pillar/master_contrail.sls

diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index b1d5037..f9700c1 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -45,6 +45,7 @@
       name: node040
     apiserver:
       address: 10.0.175.100
+      internal_address: 185.22.97.1
       insecure_address: 127.0.0.1
       insecure_port: 8080
     ca: kubernetes

tests/pillar/master_contrail4_0.sls

diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index f900fe5..bb8ae96 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -39,6 +39,7 @@
       name: node040
     apiserver:
       address: 10.0.175.100
+      internal_address: 185.22.97.1
       insecure_address: 127.0.0.1
       insecure_port: 8080
     ca: kubernetes