From b79ba5557b9eaca8374dd912d6032d4f3701586f Mon Sep 17 00:00:00 2001 From: James Parker Date: Wed, 9 Feb 2022 11:36:51 -0500 Subject: [PATCH] Consolidate roles into pre playbook as tasks Remove roles directory and respective tasks from whitebox-common and whitebox-nova-compute and consolidate those tasks into whitebox/pre.yaml. Also remove the installation of the package numactl since it is no longer used in tests. Change-Id: Ife7277db7be8d32a2630b3a221e641f9dca1ceb3 --- playbooks/whitebox/pre.yaml | 20 +++++++++++++++++-- roles/whitebox-common/tasks/main.yml | 17 ---------------- roles/whitebox-nova-compute/tasks/main.yml | 9 --------- .../api/compute/test_cpu_pinning.py | 2 ++ 4 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 roles/whitebox-common/tasks/main.yml delete mode 100644 roles/whitebox-nova-compute/tasks/main.yml diff --git a/playbooks/whitebox/pre.yaml b/playbooks/whitebox/pre.yaml index 99a89952..e7eec76d 100644 --- a/playbooks/whitebox/pre.yaml +++ b/playbooks/whitebox/pre.yaml @@ -1,5 +1,21 @@ - hosts: all roles: - ensure-pip - - whitebox-common - - whitebox-nova-compute + + tasks: + - name: crudini + pip: + name: crudini + state: present + become: yes + # NOTE(artom) The run-tempest role runs as the tempest user, so we need to give + # the tempest user SSH access to all hosts. Devstack's orchestrate-devstack + # role should have put a pubkey into the stack user's authorized_keys, so if we + # put the corresponding private key in the tempest user's .ssh, things should + # magically work. + - name: Setup tempest SSH key + include_role: + name: copy-build-sshkey + vars: + ansible_become: yes + copy_sshkey_target_user: 'tempest' \ No newline at end of file diff --git a/roles/whitebox-common/tasks/main.yml b/roles/whitebox-common/tasks/main.yml deleted file mode 100644 index 3bd4820e..00000000 --- a/roles/whitebox-common/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: crudini - pip: - name: crudini - state: present - become: yes - -# NOTE(artom) The run-tempest role runs as the tempest user, so we need to give -# the tempest user SSH access to all hosts. Devstack's orchestrate-devstack -# role should have put a pubkey into the stack user's authorized_keys, so if we -# put the corresponding private key in the tempest user's .ssh, things should -# magically work. -- name: Setup tempest SSH key - include_role: - name: copy-build-sshkey - vars: - ansible_become: yes - copy_sshkey_target_user: 'tempest' diff --git a/roles/whitebox-nova-compute/tasks/main.yml b/roles/whitebox-nova-compute/tasks/main.yml deleted file mode 100644 index 0e34393f..00000000 --- a/roles/whitebox-nova-compute/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Install numactl - package: - name: numactl - state: present - become: yes - -- name: Allocate hugepages - shell: echo {{ num_hugepages }} > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages - become: yes diff --git a/whitebox_tempest_plugin/api/compute/test_cpu_pinning.py b/whitebox_tempest_plugin/api/compute/test_cpu_pinning.py index 48c1ef21..01847d2c 100644 --- a/whitebox_tempest_plugin/api/compute/test_cpu_pinning.py +++ b/whitebox_tempest_plugin/api/compute/test_cpu_pinning.py @@ -34,6 +34,7 @@ from tempest.common import utils from tempest.common import waiters from tempest import config from tempest.exceptions import BuildErrorException +from tempest.lib import decorators from whitebox_tempest_plugin.api.compute import base from whitebox_tempest_plugin.api.compute import numa_helper @@ -766,6 +767,7 @@ class NUMALiveMigrationTest(NUMALiveMigrationBase): self.assertEqual(threads_a, threads_b, 'After live migration emulator ' 'threads for both servers should be the same') + @decorators.skip_because(bug='2009853', bug_type='storyboard') def test_hugepages(self): host_a, host_b = [whitebox_utils.get_ctlplane_address(host) for host in self.list_compute_hosts()]