From 6a2bb6d1e625e6f58ab8f39c9db1c546a41c921d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 25 Sep 2017 13:22:09 -0400 Subject: Applies Tacker upstream patches and fixes fernet dir perms We need a couple patches to Tacker upstream that we will not get now that our images are frozen in RDO. We should remove them on upgrade to Pike. Also this patch fixes the permissions on the fernet keys dir so that the Tacker group can write. Change-Id: I6468356f1d16d3b8ab58d46f653431e29960e190 Signed-off-by: Tim Rozet (cherry picked from commit 91a5fa414d46b5b2215bf823166babd034e92503) --- build/overcloud-full.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 06e461f7..dbb4de70 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -47,6 +47,7 @@ qemu-img resize overcloud-full_build.qcow2 +1200M # expand file system to max disk size # installing forked apex-puppet-tripleo # upload neutron port data plane status +# REMOVE Tacker VNFFG patch when moving to Pike LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "xfs_growfs /dev/sda" \ --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \ @@ -73,6 +74,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-ml2-ip-version-fix.patch" \ --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ + --upload ${BUILD_ROOT}/patches/tacker-vnffg-input-params.patch:/usr/lib/python2.7/site-packages/ \ + --run-command "cd usr/lib/python2.7/site-packages/ && patch -p1 < tacker-vnffg-input-params.patch" \ -a overcloud-full_build.qcow2 # apply neutron port data plane status patches -- cgit 1.2.3-korg