unite opencontrail parameters
Change-Id: I14192c00986ab165dd50b4e67546b66e6d16093e
diff --git a/kubernetes/files/opencontrail/network.conf b/kubernetes/files/opencontrail/network.conf
index 99618f4..5ea6398 100644
--- a/kubernetes/files/opencontrail/network.conf
+++ b/kubernetes/files/opencontrail/network.conf
@@ -6,7 +6,7 @@
default-domain = {{ master.network.get('default_domain', 'default-domain') }}
public-ip-range = {{ master.network.public_ip_range }}
cluster-service = {{ master.network.get('cluster_service', 'kube-system/default') }}
-api-server = {{ master.network.opencontrail.address }}
+api-server = {{ master.network.config.api.host }}
api-port = {{ master.network.get('port', '8082') }}
default-project = {{ master.network.get('default_project','default-domain:default-project') }}
public-network = {{ master.network.public_network }}
diff --git a/kubernetes/files/opencontrail/opencontrail.conf b/kubernetes/files/opencontrail/opencontrail.conf
index 128c0a7..d675318 100644
--- a/kubernetes/files/opencontrail/opencontrail.conf
+++ b/kubernetes/files/opencontrail/opencontrail.conf
@@ -2,7 +2,7 @@
{
"cniVersion": "0.2.0",
"contrail" : {
- "apiserver": {"address": "{{ pool.network.config.api.address }}", "port": {{ pool.network.config.api.get('port', 8082) }}, "default-domain": "default-domain"},
+ "apiserver": {"address": "{{ pool.network.config.api.host }}", "port": {{ pool.network.config.api.get('port', 8082) }}, "default-domain": "default-domain"},
"vrouter" : {
"ip" : "127.0.0.1",
"port" : 9091
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index c451532..39f9956 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -60,7 +60,9 @@
allow_privileged: true
network:
engine: opencontrail
- host: 10.0.170.70
+ config:
+ api:
+ host: 10.0.170.70
port: 8082
default_domain: default-domain
default_project: default-domain:default-project
diff --git a/tests/pillar/pool_contrail4_0.sls b/tests/pillar/pool_contrail4_0.sls
index cc3296c..28807e5 100644
--- a/tests/pillar/pool_contrail4_0.sls
+++ b/tests/pillar/pool_contrail4_0.sls
@@ -33,6 +33,6 @@
version: 4.0
config:
api:
- address: 127.0.0.1
+ host: 127.0.0.1
hyperkube:
hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd