From bef1c74f9bbed08326f087707daaf33ab80333f1 Mon Sep 17 00:00:00 2001 From: Bohdan Dobrelia Date: Wed, 23 Oct 2024 15:01:50 +0200 Subject: [PATCH] Launch the test VM off a hugepages-enabled flavor Signed-off-by: Bohdan Dobrelia --- docs_dev/assemblies/development_environment.adoc | 5 ++++- tests/roles/development_environment/defaults/main.yaml | 1 + tests/roles/development_environment/files/pre_launch.bash | 6 +++++- tests/roles/development_environment/tasks/main.yaml | 1 + tests/vars.sample.yaml | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs_dev/assemblies/development_environment.adoc b/docs_dev/assemblies/development_environment.adoc index d7a49973c..432e71bc8 100644 --- a/docs_dev/assemblies/development_environment.adoc +++ b/docs_dev/assemblies/development_environment.adoc @@ -145,8 +145,9 @@ To use Wallaby content instead, run the following: [,bash] ---- cd ~/install_yamls/devsetup -make standalone +EDPM_CONFIGURE_HUGEPAGES=false make standalone <1> ---- +<1> To configure the host for a simplistic hugepages setup, set `EDPM_CONFIGURE_HUGEPAGES=true`. To deploy using TLS everywhere enabled, instead run: @@ -231,12 +232,14 @@ Create a test VM instance with a test volume attachement: cd ~/data-plane-adoption export CINDER_VOLUME_BACKEND_CONFIGURED=true <1> export CINDER_BACKUP_BACKEND_CONFIGURED=true +export EDPM_CONFIGURE_HUGEPAGES=false <2> export OPENSTACK_COMMAND="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@192.168.122.100 OS_CLOUD=standalone openstack" OS_CLOUD_IP=192.168.122.100 OS_CLOUD_NAME=standalone \ bash tests/roles/development_environment/files/pre_launch.bash ---- <1> Use `CINDER_*_BACKEND_CONFIGURED=false`, if Cinder Volume or Backup services' storage backends have been not configured for the source cloud, or won't be configured for the target cloud. That might be a valid case for some developement setups, but not for a production scenarios. +<2> To configure a flavor with hugepages set `EDPM_CONFIGURE_HUGEPAGES=true`. This also creates a test Cinder volume, a backup from it, and a snapshot of it. diff --git a/tests/roles/development_environment/defaults/main.yaml b/tests/roles/development_environment/defaults/main.yaml index 2c5ca2fb9..fa8e63d08 100644 --- a/tests/roles/development_environment/defaults/main.yaml +++ b/tests/roles/development_environment/defaults/main.yaml @@ -4,6 +4,7 @@ edpm_privatekey_path: ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa run_pre_adoption_validation: true os_cloud_name: standalone source_osp_ssh_user: root +use_hugepages: false # Supported storage backends for Cinder of the source cloud # must match those configured for the target cloud supported_volume_backends: [] diff --git a/tests/roles/development_environment/files/pre_launch.bash b/tests/roles/development_environment/files/pre_launch.bash index 6e1b9a1e3..79c088725 100755 --- a/tests/roles/development_environment/files/pre_launch.bash +++ b/tests/roles/development_environment/files/pre_launch.bash @@ -70,8 +70,12 @@ ${BASH_ALIASES[openstack]} image show cirros || \ ${BASH_ALIASES[openstack]} image create --container-format bare --disk-format $DISK_FORMAT cirros < /tmp/$RAW # Create flavor +HPARGS=" " +if [ "${EDPM_CONFIGURE_HUGEPAGES:-false}" = "true" ] ; then + HPARGS="set huge_pages --property hw:mem_page_size=2MB" +fi ${BASH_ALIASES[openstack]} flavor show m1.small || \ - ${BASH_ALIASES[openstack]} flavor create --ram 512 --vcpus 1 --disk 1 --ephemeral 1 m1.small + ${BASH_ALIASES[openstack]} flavor create $HPARGS --ram 512 --vcpus 1 --disk 1 --ephemeral 1 m1.small # Create networks ${BASH_ALIASES[openstack]} network show private || ${BASH_ALIASES[openstack]} network create private --share diff --git a/tests/roles/development_environment/tasks/main.yaml b/tests/roles/development_environment/tasks/main.yaml index 4796ff488..ea234d49e 100644 --- a/tests/roles/development_environment/tasks/main.yaml +++ b/tests/roles/development_environment/tasks/main.yaml @@ -8,6 +8,7 @@ cmd: | {{ shell_header }} export OPENSTACK_COMMAND="{{ openstack_command }}" + export EDPM_CONFIGURE_HUGEPAGES={{ use_hugepages | string | lower }} export CINDER_VOLUME_BACKEND_CONFIGURED={{ cinder_volume_backend_configured | string | lower }} export CINDER_BACKUP_BACKEND_CONFIGURED={{ cinder_backup_backend_configured | string | lower }} {{ lookup('ansible.builtin.file', prelaunch_test_instance_script) }} diff --git a/tests/vars.sample.yaml b/tests/vars.sample.yaml index 0067d220b..9a119e40d 100644 --- a/tests/vars.sample.yaml +++ b/tests/vars.sample.yaml @@ -71,6 +71,7 @@ supported_backup_backends: #CUSTOMIZE_THIS # Whether the adopted node will host compute services compute_adoption: true +use_hugepages: false # Where perform or not telemetry installation during adoption telemetry_adoption: true