Fix performance option handling

 - Fix image name replacement in environments/numa.yaml in t-h-t
 - Accommodate patch to opnfv-tht disabling libvirt pinning by default.

 opnfv-tht-pr: 17

Change-Id: I4f45a120b236e8fbaa1eefd6da903d8f5e584764
Signed-off-by: Michael Chapman <woppin@gmail.com>

diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh
index 0a3e3d0..50843e4 100644 (file)
--- a/build/build_perf_image.sh
+++ b/build/build_perf_image.sh
@@ -27,6 +27,8 @@ fi
 if [ "$CATEGORY" == "nova" ]; then
   if [ "$KEY" == "libvirtpin" ]; then
     sudo sed -i "s/#LibvirtCPUPinSet:.*/LibvirtCPUPinSet: '${VALUE}'/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+    sudo sed -i "s/^#resource_registry:/resource_registry:/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+    sudo sed -i "s/#  {numa}/  OS::TripleO::ComputeExtraConfigPre: ..\/puppet\/extraconfig\/pre_deploy\/compute\/numa.yaml/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
   fi
 fi
 

diff --git a/build/set_perf_images.sh b/build/set_perf_images.sh
index ea31c7f..04702a9 100644 (file)
--- a/build/set_perf_images.sh
+++ b/build/set_perf_images.sh
@@ -22,10 +22,10 @@ for ROLE in $@; do
   fi
 
   if [ "$ROLE" == "Compute" ]; then
-    sudo sed -i "s/NovaImage: overcloud-full/Compute-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+    sudo sed -i "s/NovaImage: .*/NovaImage: Compute-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
   fi
 
   if [ "$ROLE" == "BlockStorage" ]; then
-    sudo sed -i "s/BlockStorageImage: overcloud-full/BlockStorage-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
+    sudo sed -i "s/BlockStorageImage: .*/BlockStorageImage: BlockStorage-overcloud-full/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
   fi
 done

diff --git a/ci/deploy.sh b/ci/deploy.sh
index a40b92a..cc0e370 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -856,7 +856,7 @@ set -o errexit
 echo "Uploading overcloud glance images"
 openstack overcloud image upload
 
-bash -x set_perf_images.sh ${performance_roles}
+bash -x set_perf_images.sh ${performance_roles[@]}
 
 echo "Configuring undercloud and discovering nodes"
 openstack baremetal import --json instackenv.json