Merge "Fix MongoDB connection url configuration in Ceilometer"

[apex-tripleo-heat-templates.git] / overcloud-resource-registry-puppet.yaml

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 81a46cf..c9041c6 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -2,7 +2,7 @@ resource_registry:
   OS::TripleO::BlockStorage: puppet/cinder-storage-puppet.yaml
   OS::TripleO::BlockStorage::Net::SoftwareConfig: net-config-noop.yaml
   OS::TripleO::Compute: puppet/compute-puppet.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: net-config-bridge.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: net-config-noop.yaml
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
   OS::TripleO::Controller: puppet/controller-puppet.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
@@ -23,6 +23,7 @@ resource_registry:
   OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
   OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
   OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
+  OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
 
   # TripleO overcloud networks
   OS::TripleO::Network: network/networks.yaml
@@ -67,5 +68,8 @@ resource_registry:
   # Cinder backend config for the controller role
   OS::TripleO::Controller::CinderBackend: extraconfig/controller/noop.yaml
 
+  # Port assignments for service virtual IPs for the controller role
+  OS::TripleO::Controller::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml
+
 parameter_defaults:
   EnablePackageInstall: false