From dc5f84a70c602977ccff5ae09c66df6bb85c5fcd Mon Sep 17 00:00:00 2001 From: slava Date: Thu, 12 May 2016 03:01:59 +0300 Subject: [PATCH] Rerun set of tasks to update hiera info before start 'cgroups' task Currently we are not collecting task's dependencies when we run it separately. So, in this case only 'cgroups' task will be triggered with outdated hiera data. Change-Id: I671c011fa6e51acabaf64e9ba37a7e303b506543 Closes-Bug: #1573066 (cherry picked from commit 8757f4b3bded9ed5b8ff6e31c5841e44c93e10db) --- fuelweb_test/models/fuel_web_client.py | 5 +++-- fuelweb_test/tests/test_cgroups.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py index f3a1aafcf..fdfe2a327 100644 --- a/fuelweb_test/models/fuel_web_client.py +++ b/fuelweb_test/models/fuel_web_client.py @@ -2491,8 +2491,9 @@ class FuelWebClient(object): with self.get_ssh_for_node(slave.name) as remote: data = yaml.load(''.join( remote.execute('cat /etc/astute.yaml')['stdout'])) - node_name = [node['fqdn'] for node in data['nodes'] - if node['role'] == role][0] + nodes = data['network_metadata']['nodes'] + node_name = [node['fqdn'] for node in nodes.values() + if role in node['node_roles']][0] logger.debug("node name is {0}".format(node_name)) fqdn = self.get_fqdn_by_hostname(node_name) devops_node = self.get_devops_node_by_nailgun_fqdn(fqdn) diff --git a/fuelweb_test/tests/test_cgroups.py b/fuelweb_test/tests/test_cgroups.py index 4ce67bf0d..00cd69af5 100644 --- a/fuelweb_test/tests/test_cgroups.py +++ b/fuelweb_test/tests/test_cgroups.py @@ -89,7 +89,8 @@ class TestCgroupHa(TestBasic): cluster_id, self.generate_attributes(cgroups)) task = self.fuel_web.client.put_deployment_tasks_for_cluster( cluster_id=cluster_id, - data=["cgroups"], + data=["upload_configuration", "configuration_symlink", + "hiera", "cgroups"], node_id=node_ids) self.fuel_web.assert_task_success(task)