Move the main template files for defalut services to new syntax generation

When generating these templates, we should
create them with the "-role" appended as they will
be generated from a role.role.j2.yaml file.

i.e. role.role.j2.yaml will generate <service>-role.yaml
     config.role.j2.yaml will generate <service>-config.yaml

Partial-Bug: #1626976
Change-Id: I614dc462fd7fc088b67634d489d8e7b68e7d4ab1

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 6c30d3f..d4a5c6b 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -10,7 +10,7 @@ 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

diff --git a/puppet/blockstorage.yaml b/puppet/blockstorage-role.yaml
similarity index 100%
rename from puppet/blockstorage.yaml
rename to puppet/blockstorage-role.yaml

diff --git a/puppet/cephstorage.yaml b/puppet/cephstorage-role.yaml
similarity index 100%
rename from puppet/cephstorage.yaml
rename to puppet/cephstorage-role.yaml

diff --git a/puppet/compute.yaml b/puppet/compute-role.yaml
similarity index 100%
rename from puppet/compute.yaml
rename to puppet/compute-role.yaml

diff --git a/puppet/controller.yaml b/puppet/controller-role.yaml
similarity index 100%
rename from puppet/controller.yaml
rename to puppet/controller-role.yaml

diff --git a/puppet/objectstorage.yaml b/puppet/objectstorage-role.yaml
similarity index 100%
rename from puppet/objectstorage.yaml
rename to puppet/objectstorage-role.yaml