Merge "barometer: fix barometer apex build"

diff --combined build/opnfv-environment.yaml
index 589c00c,ac47309..3df18e9
--- 1/build/opnfv-environment.yaml
--- 2/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@@ -160,7 -160,7 +160,7 @@@ parameter_defaults
    ComputeServices:
      - OS::TripleO::Services::AuditD
      - OS::TripleO::Services::Sshd
-     #- OS::TripleO::Services::Barometer
+     - OS::TripleO::Services::Barometer
      - OS::TripleO::Services::CACerts
      - OS::TripleO::Services::CephClient
      - OS::TripleO::Services::CephOSD
@@@ -196,8 -196,6 +196,8 @@@ resource_registry
    OS::TripleO::Services::SwiftStorage: OS::Heat::None
    #OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
    OS::TripleO::Services::SwiftProxy: OS::Heat::None
 +  OS::TripleO::Services::BarbicanApi: "/usr/share/openstack-tripleo-heat-\
 +    templates/puppet/services/barbican-api.yaml"
    # Extra Config
    OS::TripleO::ComputeExtraConfigPre: OS::Heat::None
    OS::TripleO::ControllerExtraConfigPre: OS::Heat::None

diff --combined build/overcloud-full.sh
index 527e39e,8030c76..7ed57d0
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -48,7 -48,6 +48,7 @@@ qemu-img resize overcloud-full_build.qc
  # installing forked apex-puppet-tripleo
  # upload neutron port data plane status
  LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
 +    --run-command "curl -f https://trunk.rdoproject.org/centos7-pike/delorean-deps.repo > /etc/yum.repos.d/delorean-deps.repo" \
      --run-command "xfs_growfs /dev/sda" \
      --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \
      --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf apex-puppet-tripleo.tar.gz" \
@@@ -67,7 -66,6 +67,7 @@@
      --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \
      --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \
      --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \
 +    --install openstack-utils \
      -a overcloud-full_build.qcow2
  #    --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \
  #    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \
@@@ -148,8 -146,7 +148,7 @@@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMI
      -a overcloud-full_build.qcow2
  
      # upload and install barometer packages
-     # FIXME collectd pkgs conflict during upgrade to Pike
-     # barometer_pkgs overcloud-full_build.qcow2
+     barometer_pkgs overcloud-full_build.qcow2
  
  fi # end x86_64 specific items