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 2aebc10..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)
@@ -10,20 +11,29 @@ resource_registry:
   OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
 
 {% for role in roles %}
-  OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}.yaml
+  OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml
   OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml
   OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
   OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
   OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
   # Port assignments for the {{role.name}} role
+  # Note we have to special-case ObjectStorage for backwards compatibility
+  {% if role.name != 'ObjectStorage' %}
   OS::TripleO::{{role.name}}::Ports::ExternalPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::InternalApiPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::StoragePort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::StorageMgmtPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::TenantPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::ManagementPort: network/ports/noop.yaml
+  {% else %}
+  OS::TripleO::SwiftStorage::Ports::ExternalPort: network/ports/noop.yaml
+  OS::TripleO::SwiftStorage::Ports::InternalApiPort: network/ports/noop.yaml
+  OS::TripleO::SwiftStorage::Ports::StoragePort: network/ports/noop.yaml
+  OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
+  OS::TripleO::SwiftStorage::Ports::TenantPort: network/ports/noop.yaml
+  OS::TripleO::SwiftStorage::Ports::ManagementPort: network/ports/noop.yaml
+  {% endif %}
   OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
-
 {% endfor %}
 
   # This resource registry entry will override the one generated by default
@@ -99,6 +109,7 @@ resource_registry:
   OS::TripleO::Services::CinderBackup: OS::Heat::None
   OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
   OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml
+  OS::TripleO::Services::BlockStorageCinderVolume: puppet/services/cinder-volume.yaml
   OS::TripleO::Services::Core: OS::Heat::None
   OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
   OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml
@@ -132,6 +143,8 @@ resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
   OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
   OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
+  OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
+  OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
   OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
   OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
   OS::TripleO::Services::SaharaApi: OS::Heat::None
@@ -187,9 +200,14 @@ resource_registry:
   OS::TripleO::Services::NovaIronic: OS::Heat::None
   OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
   OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
-  OS::TripleO::Services::OpenDaylight: OS::Heat::None
+  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