Fixes missing CephClientKey generation

[apex.git] / build / undercloud.sh

diff --git a/build/undercloud.sh b/build/undercloud.sh
index baaf424..6bb8ac9 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -34,13 +34,13 @@ populate_cache $calipso_uri_base/$calipso_script
 # enabling ceph OSDs to live on the controller
 # seeding configuration files specific to OPNFV
 # Add performance image scripts
-LIBGUESTFS_BACKEND=direct virt-customize \
+LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
     --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \
     --install "openstack-utils" \
     --install "ceph-common" \
-    --install "http://mirror.centos.org/centos/7/cloud/x86_64/openstack-ocata/python2-networking-sfc-4.0.0-1.el7.noarch.rpm" \
+    --install openstack-nova-compute \
     --install epel-release \
     --install python34,python34-pip \
     --install openstack-ironic-inspector,subunit-filters,docker-distribution,openstack-tripleo-validations \
@@ -59,8 +59,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${CACHE_DIR}/${calipso_script}:/root/ \
     --install "libguestfs-tools" \
     --install "python-tackerclient" \
-    --upload ${BUILD_ROOT}/patches/tacker-client-fix-symmetrical.patch:/usr/lib/python2.7/site-packages/ \
-    --run-command "cd usr/lib/python2.7/site-packages/ && patch -p1 < tacker-client-fix-symmetrical.patch" \
     --run-command "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo" \
     --install yum-utils,lvm2,device-mapper-persistent-data \
     -a undercloud_build.qcow2