Change logic of test for reconfiguration of keystone to use LDAP
Change-Id: I6efaac6f9d135e9a37cf316e455779f31d9a5025 Closes-Bug: #1533812
This commit is contained in:
parent
0630e7d91f
commit
071b331c3c
@ -499,33 +499,36 @@ class ServicesReconfiguration(TestBasic):
|
|||||||
controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
|
controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
|
||||||
cluster_id, ['controller'])
|
cluster_id, ['controller'])
|
||||||
|
|
||||||
ldap_cntrllr = controllers[0]
|
|
||||||
|
|
||||||
self.show_step(2)
|
self.show_step(2)
|
||||||
config = utils.get_config_template('keystone_ldap')
|
config = utils.get_config_template('keystone_ldap')
|
||||||
self.fuel_web.client.upload_configuration(
|
self.fuel_web.client.upload_configuration(
|
||||||
config,
|
config,
|
||||||
cluster_id,
|
cluster_id)
|
||||||
node_id=ldap_cntrllr['id'])
|
|
||||||
|
|
||||||
self.show_step(3)
|
self.show_step(3)
|
||||||
task = self.fuel_web.client.apply_configuration(
|
task = self.fuel_web.client.apply_configuration(
|
||||||
cluster_id,
|
cluster_id)
|
||||||
node_id=ldap_cntrllr['id'])
|
|
||||||
|
|
||||||
self.show_step(4)
|
self.show_step(4)
|
||||||
try:
|
try:
|
||||||
self.fuel_web.assert_task_success(task, timeout=1800, interval=30)
|
self.fuel_web.assert_task_success(task, timeout=3600, interval=30)
|
||||||
except AssertionError:
|
except AssertionError:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
raise Exception("New configuration was not applied")
|
raise Exception("New configuration was not applied")
|
||||||
|
|
||||||
self.show_step(5)
|
self.show_step(5)
|
||||||
with self.env.d_env.get_ssh_to_remote(ldap_cntrllr['ip']) as remote:
|
flag = False
|
||||||
|
for cntrllr in controllers:
|
||||||
|
with self.env.d_env.get_ssh_to_remote(cntrllr['ip']) as remote:
|
||||||
log_path = '/var/log/puppet.log'
|
log_path = '/var/log/puppet.log'
|
||||||
cmd = "grep \"Can't contact LDAP server\" {0}".format(log_path)
|
cmd = "grep \"Can't contact LDAP server\" {0}".format(log_path)
|
||||||
utils.run_on_remote_get_results(remote, cmd)
|
result = remote.execute(cmd)
|
||||||
|
if result['exit_code'] == 0:
|
||||||
|
flag = True
|
||||||
|
break
|
||||||
|
|
||||||
|
asserts.assert_true(flag, 'A configuration was not applied')
|
||||||
|
|
||||||
self.env.make_snapshot("reconfigure_keystone_to_use_ldap")
|
self.env.make_snapshot("reconfigure_keystone_to_use_ldap")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user