From: Tim Rozet <trozet@redhat.com>
Date: Tue, 1 Aug 2017 20:13:54 +0000 (+0000)
Subject: Merge "Adds Barometer service"
X-Git-Tag: opnfv-5.0.0~112
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=98339f98d955bb046e9651f8c0c4f17eb2b0f79f;p=apex.git

Merge "Adds Barometer service"
---

98339f98d955bb046e9651f8c0c4f17eb2b0f79f
diff --cc build/opnfv-environment.yaml
index 2a97dceb,a6bd7378..67cba9fc
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@@ -122,12 -122,13 +122,13 @@@ parameter_defaults
      - OS::TripleO::Services::Etcd
  #    - OS::TripleO::Services::Gluon
      - OS::TripleO::Services::Tacker
 -#    - OS::TripleO::Services::NeutronHoneycombAgent
 +    - OS::TripleO::Services::NeutronHoneycombAgent
      - OS::TripleO::Services::Congress
 -#    - OS::TripleO::Services::NeutronVppAgent
 +    - OS::TripleO::Services::NeutronVppAgent
      - OS::TripleO::Services::OVNDBs
 -#    - OS::TripleO::Services::Vpp
 +    - OS::TripleO::Services::Vpp
    ComputeServices:
+     - OS::TripleO::Services::Barometer
      - OS::TripleO::Services::CACerts
      - OS::TripleO::Services::CephClient
      - OS::TripleO::Services::CephOSD
diff --cc build/overcloud-full.sh
index 40ffea33,e8697925..7b008890
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -53,8 -54,12 +54,9 @@@ LIBGUESTFS_BACKEND=direct virt-customiz
      --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" \
 -    --install python-etcd \
 -    --run-command "puppet module install cristifalcas/etcd" \
      --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
      --install unzip \
      --upload ${BUILD_DIR}/vsperf.tar.gz:/var/opt \