summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/build_perf_image.sh2
-rw-r--r--build/set_perf_images.sh4
-rwxr-xr-xci/deploy.sh4
3 files changed, 6 insertions, 4 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..4f123e10 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -753,7 +753,7 @@ sleep 15
##params: none
function undercloud_prep_overcloud_deploy {
if [[ "${#deploy_options_array[@]}" -eq 0 || "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
- if [ "${deploy_options_array['sdn_l3']}" == 'true' ]; then
+ if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml"
elif [ "${deploy_options_array['sfc']}" == 'True' ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml"
@@ -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