summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-17 04:38:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-17 04:38:56 +0000
commitc6ba57aa15f96e4a147b09bf796b67d0357a096b (patch)
tree12eb045dbe8ed74a35552ea33338ff36982ddec2 /build
parentdd00a13e93ec1a23cd6f1bcb26dae55960ca1b26 (diff)
parent96013ac0328d2a4f54c6432e3900849db6c78d48 (diff)
Merge "Move modified enable_rt_kvm.yaml to .build directory"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/undercloud.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 4e1b963a..424f6f86 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -25,7 +25,7 @@ git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${
popd > /dev/null
# inject rt_kvm kernel rpm name into the enable file
-sed -i "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml
+sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml
# installing forked opnfv-tht
# enabling ceph OSDs to live on the controller
@@ -52,7 +52,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ${BUILD_ROOT}/opnfv-environment.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/first-boot.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/kvm4nfv-1st-boot.yaml:/home/stack/ \
- --upload ${BUILD_ROOT}/enable_rt_kvm.yaml:/home/stack/ \
+ --upload ${BUILD_DIR}/enable_rt_kvm.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/csit-environment.yaml:/home/stack/ \
--upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \
--install "python2-congressclient" \