Allow Glance API and Registry to be split

[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 a7185a4..1102a7f 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -1,17 +1,7 @@
 resource_registry:
-  OS::TripleO::BlockStorage: puppet/cinder-storage.yaml
-  OS::TripleO::Compute: puppet/compute.yaml
+
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
-  OS::TripleO::Controller: puppet/controller.yaml
-  OS::TripleO::ObjectStorage: puppet/swift-storage.yaml
-  OS::TripleO::CephStorage: puppet/ceph-storage.yaml
-  # set to controller-config-pacemaker.yaml to enable pacemaker
-  OS::TripleO::ControllerConfig: puppet/controller-config.yaml
   OS::TripleO::PostDeploySteps: puppet/post.yaml
-  OS::TripleO::ComputeConfig: puppet/compute-config.yaml
-  OS::TripleO::BlockStorageConfig: puppet/blockstorage-config.yaml
-  OS::TripleO::ObjectStorageConfig: puppet/objectstorage-config.yaml
-  OS::TripleO::CephStorageConfig: puppet/cephstorage-config.yaml
   OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
   OS::TripleO::DefaultPasswords: default_passwords.yaml
 
@@ -20,11 +10,11 @@ resource_registry:
   OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
 
 {% for role in roles %}
+  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
   OS::TripleO::{{role.name}}::Ports::ExternalPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::InternalApiPort: network/ports/noop.yaml
@@ -32,8 +22,8 @@ resource_registry:
   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
-
   OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
+
 {% endfor %}
 
   # This resource registry entry will override the one generated by default
@@ -109,6 +99,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
@@ -197,7 +188,7 @@ 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