From 722201e12720f290d7906e6e9c603f8d50e5217e Mon Sep 17 00:00:00 2001 From: Yuvaraja Mariappan Date: Mon, 11 May 2015 16:39:43 -0700 Subject: [PATCH] Bug: 1452647 fab network in dvs switch is done for vcenter and not for the openstack. It is missed to take care openstack part when we added the support in vcenter Change-Id: I60b10fec0edcf8948048f845f157f90f69fb13e6 --- fabfile/tasks/provision.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py index 18db4286f..6fbea183f 100644 --- a/fabfile/tasks/provision.py +++ b/fabfile/tasks/provision.py @@ -1984,14 +1984,17 @@ def prov_esxi(*args): for host in host_list: with settings(host=host): if host in esxi_info.keys(): - if 'dv_switch_fab' in vcenter_info.keys(): - if not 'fabric_vswitch' in esxi_info[host].keys(): - dv_switch_fab = True - std_switch = False + if orch == 'openstack': + std_switch = True + if orch == 'vcenter': + if 'dv_switch_fab' in vcenter_info.keys(): + if not 'fabric_vswitch' in esxi_info[host].keys(): + dv_switch_fab = True + std_switch = False + else: + std_switch = True else: std_switch = True - else: - std_switch = True if (std_switch == True): apply_esxi_defaults(esxi_info[host]) configure_esxi_network(esxi_info[host]) @@ -2001,7 +2004,7 @@ def prov_esxi(*args): esxi_info[host]['fabric_vswitch'] = None power_on = False if orch == 'openstack': - create_esxi_compute_vm(esxi_info[host], None) + create_esxi_compute_vm(esxi_info[host], None, power_on) if orch == 'vcenter': create_esxi_compute_vm(esxi_info[host], vcenter_info, power_on) else: