diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-10-04 18:28:39 +0200 |
|---|---|---|
| committer |   Steven Hardy <shardy@redhat.com> | 2016-10-04 20:15:33 +0000 |
| commit | 883addf267933395c580e0eab3efc379401c946c (patch) | |
| tree | abbd5e2812b496bfad806d3b4117de48b7b488c9 | |
| parent | ccbc75a814e059f63453c2b40cc100709e858927 (diff) | |
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
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 | ||||
| -rw-r--r-- | puppet/blockstorage-role.yaml (renamed from puppet/blockstorage.yaml) | 0 | ||||
| -rw-r--r-- | puppet/cephstorage-role.yaml (renamed from puppet/cephstorage.yaml) | 0 | ||||
| -rw-r--r-- | puppet/compute-role.yaml (renamed from puppet/compute.yaml) | 0 | ||||
| -rw-r--r-- | puppet/controller-role.yaml (renamed from puppet/controller.yaml) | 0 | ||||
| -rw-r--r-- | puppet/objectstorage-role.yaml (renamed from puppet/objectstorage.yaml) | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 6c30d3f3..d4a5c6b6 100644 --- 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 index a66ea08b..a66ea08b 100644 --- a/puppet/blockstorage.yaml +++ b/puppet/blockstorage-role.yaml diff --git a/puppet/cephstorage.yaml b/puppet/cephstorage-role.yaml index 03a53b00..03a53b00 100644 --- a/puppet/cephstorage.yaml +++ b/puppet/cephstorage-role.yaml diff --git a/puppet/compute.yaml b/puppet/compute-role.yaml index 0205d0a6..0205d0a6 100644 --- a/puppet/compute.yaml +++ b/puppet/compute-role.yaml diff --git a/puppet/controller.yaml b/puppet/controller-role.yaml index ccb517f8..ccb517f8 100644 --- a/puppet/controller.yaml +++ b/puppet/controller-role.yaml diff --git a/puppet/objectstorage.yaml b/puppet/objectstorage-role.yaml index 899ba66d..899ba66d 100644 --- a/puppet/objectstorage.yaml +++ b/puppet/objectstorage-role.yaml |