diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-07-13 09:30:15 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2017-07-13 13:41:19 +0100 |
| commit | a6d2704468aaa4b9028196caf011b51d9c380dd2 (patch) | |
| tree | a98f3474e9b33bd7f918067878e020e6c3f58399 | |
| parent | 0b8d09b249aa5c5daf827f59ec588d3afb413c44 (diff) | |
Move services.yaml to common directory
This new directory has now been added to the RDO packaging so we
can move things common to both puppet/container architecture here,
starting with the recently combined services.yaml
Change-Id: If2ce27188c4c15002b3ad830e8d6eb9504d2f3d2
| -rw-r--r-- | common/README | 1 | ||||
| -rw-r--r-- | common/services.yaml (renamed from services.yaml) | 0 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 |
3 files changed, 1 insertions, 2 deletions
diff --git a/common/README b/common/README deleted file mode 100644 index 6a523118..00000000 --- a/common/README +++ /dev/null @@ -1 +0,0 @@ -This will contain some common templates but it needs to be added to the RPM spec first diff --git a/services.yaml b/common/services.yaml index 4d3ca8d1..4d3ca8d1 100644 --- a/services.yaml +++ b/common/services.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index aaed2603..a1220d30 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -110,7 +110,7 @@ resource_registry: OS::TripleO::DeployedServerEnvironment: OS::Heat::None # services - OS::TripleO::Services: services.yaml + OS::TripleO::Services: common/services.yaml OS::TripleO::Services::Apache: puppet/services/apache.yaml OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml OS::TripleO::Services::CephMds: OS::Heat::None |