Merge "Add contrail services to the resource registry"

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

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c7f1510..218cd2d 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -3,6 +3,7 @@ resource_registry:
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
   OS::TripleO::PostDeploySteps: puppet/post.yaml
   OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
+  OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
   OS::TripleO::DefaultPasswords: default_passwords.yaml
 
   # Tasks (for internal TripleO usage)
@@ -202,6 +203,11 @@ resource_registry:
   OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
   OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
   OS::TripleO::Services::SensuClient: OS::Heat::None
+  OS::TripleO::Services::ContrailAnalytics: puppet/services/network/contrail-analytics.yaml
+  OS::TripleO::Services::ContrailConfig: puppet/services/network/contrail-config.yaml
+  OS::TripleO::Services::ContrailControl: puppet/services/network/contrail-control.yaml
+  OS::TripleO::Services::ContrailDatabase: puppet/services/network/contrail-database.yaml
+  OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
 
 parameter_defaults:
   EnablePackageInstall: false