From 96013ac0328d2a4f54c6432e3900849db6c78d48 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 16 Mar 2017 16:31:21 -0400 Subject: Move modified enable_rt_kvm.yaml to .build directory We should not be modifying files in our repo directly during build. This patch moves the modified version of enable_rt_kvm.yaml into $BUILD_DIR rather than modifying it in place. Change-Id: Ibe160d0e5bc0f1d6633fde11de9f125ed49f58e2 Signed-off-by: Feng Pan --- build/undercloud.sh | 4 ++-- 1 file 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" \ -- cgit 1.2.3-korg