diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-14 10:50:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-14 10:50:17 +0000 |
| commit | aa5c511b827e4c3a7d6cd6021892648093427dbc (patch) | |
| tree | 68d369ac35366c268211924c5ad143c701879c99 | |
| parent | f5e031bf9a87b086841f95db587c2110fe5115ca (diff) | |
| parent | a6d2704468aaa4b9028196caf011b51d9c380dd2 (diff) | |
Merge "Move services.yaml to common directory"
| -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 |