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

diff --git a/common/README b/common/README
deleted file mode 100644 (file)
index 6a52311..0000000
--- 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
similarity index 100%
rename from services.yaml
rename to common/services.yaml

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index aaed260..a1220d3 100644 (file)
--- 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