fix hardcoded contrail-api server
Change-Id: If8dde8f50c26daa2e5dbcd05b498b52c92b2bf50
diff --git a/README.rst b/README.rst
index 6848d4e..af1531d 100644
--- a/README.rst
+++ b/README.rst
@@ -283,8 +283,6 @@
image: yashulyak/contrail-controller:latest
network:
engine: opencontrail
- host: 10.0.170.70
- port: 8082
default_domain: default-domain
default_project: default-domain:default-project
public_network: default-domain:default-project:Public
@@ -294,6 +292,9 @@
network_label: name
service_label: uses
cluster_service: kube-system/default
+ config:
+ api:
+ host: 10.0.170.70
On pools:
.. code-block:: yaml
diff --git a/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
index ebba5e2..fbf12de 100644
--- a/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
+++ b/kubernetes/files/kube-addons/contrail_network_controller/contrail-network-controller-configmap.yml
@@ -14,7 +14,7 @@
default-domain = {{ master.network.get('default_domain', 'default-domain') }}
public-ip-range = {{ master.network.get('public_ip_range', '185.22.97.128/26') }}
cluster-service = {{ master.network.get('cluster_service', 'kube-system/default') }}
- api-server = 172.16.10.252
+ api-server = {{ master.network.config.api.host }}
api-port = {{ master.network.get('port', 8082) }}
default = {{ master.network.get('default_project', 'default-domain:default-project') }}
public-network = {{ master.network.get('public_network', 'default-domain:default-project:Public') }}