Do not override the user specified cfgm host.

Change-Id: I68ab3e474cca8053cead501a93e29b80017f317b Closes-Bug: 1649679
Juniper · Dec 13, 2016 · 5e79790 · 5e79790
1 parent ce97d01
commit 5e79790
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py
@@ -1962,8 +1962,12 @@ def prov_control_bgp():
 def prov_control_bgp_node(*args, **kwargs):
     oper = kwargs.get('oper', 'add')
     tgt_node = kwargs.get('tgt_node', None)
-    cfgm_host = kwargs.get('cfgm_host', env.roledefs['cfgm'][0])
-    cfgm_ip = get_contrail_internal_vip() or hstr_to_ip(get_control_host_string(cfgm_host))
+    cfgm_host = kwargs.get('cfgm_host', None)
+    if cfgm_host:
+        cfgm_ip = hstr_to_ip(get_control_host_string(cfgm_host))
+    else:
+        cfgm_host = env.roledefs['cfgm'][0]
+        cfgm_ip = get_contrail_internal_vip() or hstr_to_ip(get_control_host_string(cfgm_host))
     cfgm_host_password = get_env_passwords(cfgm_host)
     for host_string in args:
         with settings(host_string = host_string):