Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixes ceph key import failures"
[apex.git]
/
build
/
overcloud-full.sh
diff --git
a/build/overcloud-full.sh
b/build/overcloud-full.sh
index
7ed57d0
..
a4006c4
100755
(executable)
--- 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 \
--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
-a overcloud-full_build.qcow2
# upload and install barometer packages