openstack
/
fuel-main
Code Issues Proposed changes

Fix double import settings 

Change-Id: Ifedbae029ec5183e99e78b998638a225eb1bcab4
This commit is contained in:
Oleksandr Kosse 2015-01-12 17:58:12 +02:00
parent c6389878b7
commit 9c2ff786da
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fuelweb_test/tests/test_vcenter.py
View File

@ -492,15 +492,15 @@ class VcenterDeploy(TestBasic):
# Configure a cluster. # Configure a cluster.
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
mode=settings.DEPLOYMENT_MODE_SIMPLE, mode=DEPLOYMENT_MODE_SIMPLE,
settings={ settings={
'use_vcenter': True, 'use_vcenter': True,
'volumes_vmdk': True, 'volumes_vmdk': True,
'volumes_lvm': False, 'volumes_lvm': False,
'host_ip': settings.VCENTER_IP, 'host_ip': VCENTER_IP,
'vc_user': settings.VCENTER_USERNAME, 'vc_user': VCENTER_USERNAME,
'vc_password': settings.VCENTER_PASSWORD, 'vc_password': VCENTER_PASSWORD,
'cluster': settings.VCENTER_CLUSTERS, 'cluster': VCENTER_CLUSTERS,
'tenant': 'vcenter', 'tenant': 'vcenter',
'user': 'vcenter', 'user': 'vcenter',
'password': 'vcenter' 'password': 'vcenter'
@ -574,15 +574,15 @@ class VcenterDeploy(TestBasic):
# Configure a cluster. # Configure a cluster.
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
mode=settings.DEPLOYMENT_MODE_HA, mode=DEPLOYMENT_MODE_HA,
settings={ settings={
'use_vcenter': True, 'use_vcenter': True,
'volumes_vmdk': True, 'volumes_vmdk': True,
'volumes_lvm': False, 'volumes_lvm': False,
'host_ip': settings.VCENTER_IP, 'host_ip': VCENTER_IP,
'vc_user': settings.VCENTER_USERNAME, 'vc_user': VCENTER_USERNAME,
'vc_password': settings.VCENTER_PASSWORD, 'vc_password': VCENTER_PASSWORD,
'cluster': settings.VCENTER_CLUSTERS, 'cluster': VCENTER_CLUSTERS,
'tenant': 'vcenter', 'tenant': 'vcenter',
'user': 'vcenter', 'user': 'vcenter',
'password': 'vcenter' 'password': 'vcenter'