commit 801b94fb7737f44cf15bd7f285c8e32f88cb21d0
author Jakub Pavlik <pavlk.jakub@gmail.com> Tue Jun 07 10:55:36 2016 +0200
committer Jakub Pavlik <pavlk.jakub@gmail.com> Wed Jun 22 19:38:39 2016 +0200
tree d07288a45f17ca0a247c6b7ac7b908f6f4441613
parent f824eda473fff9ed1b31ac2cbe056cc3ae3ea0de

ifmap configuration ip and passwd

Change-Id: Ia57732393bfb532e1cab0c67e3a8e7472f4069b6

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

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