commit 4e8c734e8d45dae6ccf8fdc793c1c949fa079c12
author marco <m.celoud@tcpcloud.eu> Sun Sep 18 21:57:52 2016 +0200
committer marco <m.celoud@tcpcloud.eu> Sun Sep 18 22:39:43 2016 +0200
tree 079dda96fdf973c023429912876820438fbddb2d
parent 49f50b1e7cf07e22b8590ededd6d346115bcbb61

Fix contrail control connection to ifmap

Change-Id: I4ec6e1a370495d16f8b7f9b7d09244853af3fd1a

opencontrail/files/2.2/contrail-control.conf

diff --git a/opencontrail/files/2.2/contrail-control.conf b/opencontrail/files/2.2/contrail-control.conf
index 6cd29ce..7992aea 100644
--- a/opencontrail/files/2.2/contrail-control.conf
+++ b/opencontrail/files/2.2/contrail-control.conf
@@ -29,10 +29,10 @@
 
 [IFMAP]
   certs_store=
-  password=control-node-1
+  password={{ control.bind.address }}
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 {%- if grains.get('virtual_subtype', None) == "Docker" %}
   server_url=https://{{ control.discovery.host }}:8443
 {%- endif %}
-  user=control-node-1
+  user={{ control.bind.address }}
 

opencontrail/files/3.0/contrail-control.conf

diff --git a/opencontrail/files/3.0/contrail-control.conf b/opencontrail/files/3.0/contrail-control.conf
index ad2d046..b8241e4 100644
--- a/opencontrail/files/3.0/contrail-control.conf
+++ b/opencontrail/files/3.0/contrail-control.conf
@@ -29,9 +29,9 @@
 
 [IFMAP]
   certs_store=
-  password=control-node-1
+  password={{ control.bind.address }}
 # server_url= # Provided by discovery server, e.g. https://127.0.0.1:8443
 {%- if grains.get('virtual_subtype', None) == "Docker" %}
   server_url=https://{{ control.discovery.host }}:8443
 {%- endif %}
-  user=control-node-1
+  user={{ control.bind.address }}