diff options
author | Tim Rozet <trozet@redhat.com> | 2017-08-01 20:13:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-08-01 20:13:54 +0000 |
commit | 98339f98d955bb046e9651f8c0c4f17eb2b0f79f (patch) | |
tree | 14681adeab8bcdbd71f926064e3b0a13b56e5a12 /build/overcloud-full.sh | |
parent | d2ad6082c4499cd6b49b0963bf06fb912a6dd5ca (diff) | |
parent | 2622e8417a9fca67fb0cac480410cf9c5912725a (diff) |
Merge "Adds Barometer service"
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-x | build/overcloud-full.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 40ffea33..7b008890 100755 --- 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 |