summaryrefslogtreecommitdiffstats
path: root/build/overcloud-full.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-03-10 16:02:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-10 16:02:36 +0000
commit484b7f421f8c520e45aa8cf9d9d9304132a79b4a (patch)
tree2a17c1b7f237b34985a3daa2317aa5a3d8a6fa82 /build/overcloud-full.sh
parent8a60d332f17967dfa861e1e8644d16eb3eab2346 (diff)
parent32550560a1b6e00565db8d995c84f304d4cb9893 (diff)
Merge "Fixes ceph key import failures"
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-xbuild/overcloud-full.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 7ed57d00..a4006c4a 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -145,6 +145,8 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--install python-etcd,puppet-etcd \
--install patch \
--install docker,kubelet,kubeadm,kubectl,kubernetes-cni \
+ --upload ${BUILD_ROOT}/patches/puppet-ceph.patch:/etc/puppet/modules/ceph/ \
+ --run-command "cd /etc/puppet/modules/ceph && patch -p1 < puppet-ceph.patch" \
-a overcloud-full_build.qcow2
# upload and install barometer packages