diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-03 20:29:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-03 20:29:47 +0000 |
| commit | aa5efc16674b1f14fcf7f3f0dfd98e98e7184b49 (patch) | |
| tree | b521b8d3a719a1c65ed7be078ee7c2672cb81a17 | |
| parent | e0f468ccf04c0a064b63788cc937f0f68096ff42 (diff) | |
| parent | 2eaea7fdbbb95a00afb920f3381691cd67638d95 (diff) | |
Merge "Fix performance option handling"
| -rw-r--r-- | build/build_perf_image.sh | 2 | ||||
| -rw-r--r-- | build/set_perf_images.sh | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index 6ca9fbf8..80e615ef 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 diff --git a/ci/deploy.sh b/ci/deploy.sh index af6b7779..3b46651e 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -864,7 +864,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 |