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
This commit is contained in:
James Parker 2022-02-09 11:36:51 -05:00
parent f2ea034105
commit b79ba5557b
4 changed files with 20 additions and 28 deletions

View File

@ -1,5 +1,21 @@
- hosts: all - hosts: all
roles: roles:
- ensure-pip - 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'

View File

@ -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'

View File

@ -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

View File

@ -34,6 +34,7 @@ from tempest.common import utils
from tempest.common import waiters from tempest.common import waiters
from tempest import config from tempest import config
from tempest.exceptions import BuildErrorException 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 base
from whitebox_tempest_plugin.api.compute import numa_helper 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 ' self.assertEqual(threads_a, threads_b, 'After live migration emulator '
'threads for both servers should be the same') 'threads for both servers should be the same')
@decorators.skip_because(bug='2009853', bug_type='storyboard')
def test_hugepages(self): def test_hugepages(self):
host_a, host_b = [whitebox_utils.get_ctlplane_address(host) for host in host_a, host_b = [whitebox_utils.get_ctlplane_address(host) for host in
self.list_compute_hosts()] self.list_compute_hosts()]