Merge "Fix openstack authorization for reverted environment"
This commit is contained in:
commit
892c80aa9a
|
@ -160,7 +160,7 @@ class HAOneControllerFlat(TestBasic):
|
||||||
cluster_id = self.fuel_web.get_last_created_cluster()
|
cluster_id = self.fuel_web.get_last_created_cluster()
|
||||||
os = os_actions.OpenStackActions(
|
os = os_actions.OpenStackActions(
|
||||||
self.fuel_web.get_public_vip(cluster_id),
|
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 = self.env.get_ssh_to_remote_by_name('slave-01')
|
||||||
remote.execute("echo 'Hello World' > /root/test.txt")
|
remote.execute("echo 'Hello World' > /root/test.txt")
|
||||||
|
|
|
@ -790,7 +790,7 @@ class HeatHAOneController(TestBasic):
|
||||||
|
|
||||||
os_conn = os_actions.OpenStackActions(
|
os_conn = os_actions.OpenStackActions(
|
||||||
self.fuel_web.get_public_vip(cluster_id),
|
self.fuel_web.get_public_vip(cluster_id),
|
||||||
data['password'], data['tenant'])
|
data['user'], data['password'], data['tenant'])
|
||||||
self.fuel_web.assert_cluster_ready(
|
self.fuel_web.assert_cluster_ready(
|
||||||
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
os_conn, smiles_count=5, networks_count=2, timeout=300)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue