summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMichael Chapman <woppin@gmail.com>2016-06-01 15:01:15 +1000
committerMichael Chapman <woppin@gmail.com>2016-06-03 18:05:14 +1000
commit2eaea7fdbbb95a00afb920f3381691cd67638d95 (patch)
tree80adb2c5588f4b6ee6a7fcaa6e211a2ae5ae0bd4 /build
parentb437e54b11a3cd6c1bbfa4b54534321453404516 (diff)
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>
Diffstat (limited to 'build')
-rw-r--r--build/build_perf_image.sh2
-rw-r--r--build/set_perf_images.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh
index 0a3e3d0f..50843e46 100644
--- 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 ea31c7fa..04702a93 100644
--- 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