From 2622e8417a9fca67fb0cac480410cf9c5912725a Mon Sep 17 00:00:00 2001 From: jhinman1 Date: Fri, 14 Jul 2017 20:28:14 -0400 Subject: Adds Barometer service Adds Barometer service as a deploy option to Compute nodes by specifying barometer as true in deploy settings. Barometer packages are installed only for x86_64. Adds scenarios os-nosdn-bar-ha and os-nosdn-bar-noha. Add scenarios to opnfv-apex-common.spec. Temporarily remove references to snmp packages. apex-tripleo-heat-templates: I397d2557639c87ab8afacd076a5b9fd7c056dce7 apex-puppet-tripleo: I878ff8d1e0a8b96f3380bb77f168cd5a4c3f6543 Puppet module is at: https://github.com/johnhinman/puppet-barometer. Change-Id: Ic087c2052f7849ee2cf6c63224558c2b36a8ca1f Signed-off-by: jhinman1 --- build/overcloud-full.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index cb1b94bc..e8697925 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 "yum install -y etcd" \ @@ -142,5 +144,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 -- cgit 1.2.3-korg