Merge "Adds Barometer service"

diff --cc build/opnfv-environment.yaml
index 2a97dce,a6bd737..67cba9f
--- 1/build/opnfv-environment.yaml
--- 2/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 40ffea3,e869792..7b00889
--- 1/build/overcloud-full.sh
--- 2/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 \

diff --cc build/overcloud-opendaylight.sh
Simple merge

diff --cc lib/overcloud-deploy-functions.sh
Simple merge