Merge "Adds Barometer service"

[apex.git] / build / overcloud-full.sh

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 40ffea3..7b00889 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -10,6 +10,7 @@
 set -xe
 source ./cache.sh
 source ./variables.sh
+source ./barometer-install.sh
 
 populate_cache "$rdo_images_uri/overcloud-full.tar"
 
@@ -53,6 +54,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/apex-os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
     --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf apex-os-net-config.tar.gz" \
     --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \
+    --install epel-release \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
     --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
@@ -145,5 +147,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     -a overcloud-full_build.qcow2
 fi
 
+    # upload and install barometer packages
+if [ "$(uname -i)" == 'x86_64' ]; then
+    barometer_pkgs overcloud-full_build.qcow2
+fi
+
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
 popd > /dev/null