openstack
/
fuel-main
Code Issues Proposed changes

Merge "Fix openstack authorization for reverted environment"

This commit is contained in:
Jenkins 2015-02-12 10:20:43 +00:00 committed by Gerrit Code Review
parent 698d99d62b 8ff315aa7b
commit 892c80aa9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/tests/test_ha_one_controller.py
View File

@ -160,7 +160,7 @@ class HAOneControllerFlat(TestBasic):
cluster_id = self.fuel_web.get_last_created_cluster()
os = os_actions.OpenStackActions(
self.fuel_web.get_public_vip(cluster_id),
data['password'], data['tenant'])
data['user'], data['password'], data['tenant'])
remote = self.env.get_ssh_to_remote_by_name('slave-01')
remote.execute("echo 'Hello World' > /root/test.txt")

2
fuelweb_test/tests/test_services.py
View File

@ -790,7 +790,7 @@ class HeatHAOneController(TestBasic):
os_conn = os_actions.OpenStackActions(
self.fuel_web.get_public_vip(cluster_id),
data['password'], data['tenant'])
data['user'], data['password'], data['tenant'])
self.fuel_web.assert_cluster_ready(
os_conn, smiles_count=5, networks_count=2, timeout=300)