aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Noyes <steve.noyes@oracle.com>2016-09-16 15:07:41 +0200
committerSteve Noyes <steve.noyes@oracle.com>2016-09-16 15:07:41 +0200
commite1e8a5bac52cc16718d1709852df542a856c195e (patch)
treee1e51d77356d5dd743808a5e4f1854437c1cb45b
parentf9956f2e103d8e95720b8312e6fdca18182d69a3 (diff)
downloadkolla-e1e8a5bac52cc16718d1709852df542a856c195e.tar.gz
kolla-e1e8a5bac52cc16718d1709852df542a856c195e.zip
align ceph with other svc patterns in inventory files
The pattern is: [service:children] group ... [service-subservice:children] parent (or override) TrivialFix Change-Id: Iac91cf83f1d3df8a76460f51c3f2883e8c59df24
-rw-r--r--ansible/inventory/all-in-one18
-rw-r--r--ansible/inventory/multinode18
2 files changed, 22 insertions, 14 deletions
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index 85661e589..f402925a6 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -83,15 +83,9 @@ control
[murano:children]
control
-[ceph-mon:children]
-control
-
-[ceph-rgw:children]
+[ceph:children]
control
-[ceph-osd:children]
-storage
-
[ironic:children]
control
@@ -193,6 +187,16 @@ neutron
[neutron-vpnaas-agent:children]
neutron
+# Ceph
+[ceph-mon:children]
+ceph
+
+[ceph-rgw:children]
+ceph
+
+[ceph-osd:children]
+storage
+
# Cinder
[cinder-api:children]
cinder
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 286812818..594906ca0 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -107,15 +107,9 @@ control
[ironic:children]
control
-[ceph-mon:children]
-control
-
-[ceph-rgw:children]
+[ceph:children]
control
-[ceph-osd:children]
-storage
-
[magnum:children]
control
@@ -211,6 +205,16 @@ neutron
[neutron-vpnaas-agent:children]
neutron
+# Ceph
+[ceph-mon:children]
+ceph
+
+[ceph-rgw:children]
+ceph
+
+[ceph-osd:children]
+storage
+
# Cinder
[cinder-api:children]
cinder