openstack
/
fuel-main
Code Issues Proposed changes

Merge "Use cluster VIP instead of controller IP in test 'Deploy Heat HA'" into stable/5.1

This commit is contained in:
Jenkins 2014-09-16 23:08:52 +00:00 committed by Gerrit Code Review
parent 12367ac479 bea293167d
commit 8ef433e939
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuelweb_test/tests/test_services.py
View File

@ -509,7 +509,7 @@ class HeatSimple(TestBasic):
groups=["deploy_heat_simple_neutron"])
@log_snapshot_on_error
def deploy_heat_simple_neutron(self):
"""Deploy cluster in simple mode with Neutron GRE
"""Deploy Heat cluster in simple mode with Neutron GRE
Scenario:
1. Create cluster
@ -600,7 +600,7 @@ class HeatSimple(TestBasic):
groups=["deploy_heat_simple_nova"])
@log_snapshot_on_error
def deploy_heat_simple_nova(self):
"""Deploy cluster in simple mode with Nova Network
"""Deploy Heat cluster in simple mode with Nova Network
Scenario:
1. Create cluster
@ -696,7 +696,7 @@ class HeatHA(TestBasic):
groups=["deploy_heat_ha"])
@log_snapshot_on_error
def deploy_heat_ha(self):
"""Deploy cluster in HA mode
"""Deploy Heat cluster in HA mode
Scenario:
1. Create cluster
@ -752,8 +752,9 @@ class HeatHA(TestBasic):
self.env.get_ssh_to_remote_by_name(slave),
service_name='heat-api', count=3)
controller = self.fuel_web.get_nailgun_node_by_name('slave-01')
common_func = Common(controller['ip'],
cluster_vip = self.fuel_web.get_public_vip(cluster_id)
common_func = Common(cluster_vip,
data['user'],
data['password'],
data['tenant'])