Merge "Move services.yaml to common directory"

2017-07-14 10:50:17 +00:00 · 2017-07-14 10:50:17 +00:00 · aa5c511b82
commit aa5c511b82
parent f5e031bf9a a6d2704468
3 changed files with 1 additions and 2 deletions
--- a/common/README
+++ b/common/README
@ -1 +0,0 @@
-This will contain some common templates but it needs to be added to the RPM spec first
--- a/common/services.yaml
+++ b/common/services.yaml
--- 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
				`@ -1 +0,0 @@`
				`This will contain some common templates but it needs to be added to the RPM spec first`