Merge "Fixes ceph key import failures"

diff --combined build/overcloud-full.sh
index 7ed57d0,e50fc86..a4006c4
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -145,10 -145,13 +145,12 @@@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMI
      --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
 -    # FIXME collectd pkgs conflict during upgrade to Pike
 -    # barometer_pkgs overcloud-full_build.qcow2
 +    barometer_pkgs overcloud-full_build.qcow2
  
  fi # end x86_64 specific items