Skip to content

Commit

Permalink
fab network in dvs switch is done for vcenter and not for the openstack.
Browse files Browse the repository at this point in the history
It is missed to take care openstack part when we added the support
in vcenter

Closes-Bug: #1452647

Change-Id: I2dfa2c30d64cb96e1e48025e0c94c7e8999eb347
  • Loading branch information
ymariappan committed May 13, 2015
1 parent 519cc34 commit bbb0b35
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions fabfile/tasks/provision.py
Expand Up @@ -1976,14 +1976,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])
Expand All @@ -1993,7 +1996,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:
Expand Down

0 comments on commit bbb0b35

Please sign in to comment.