commit cb2aa79b6c9786ba72394d4688bb22b6633d2019
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Apr 03 22:23:58 2020 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Apr 03 22:26:57 2020 +0400
tree 924e282362ac2b129e3a464c15edf1dd86c4d4e0
parent 932725005b52d046f0d0fb58add5b084b9775dd3

Define ceph cluster members separately for override

PROD-34823

Change-Id: If0052ec49db05a000e27a93370d056251d5eadda

metadata/service/common/cluster.yml

diff --git a/metadata/service/common/cluster.yml b/metadata/service/common/cluster.yml
index 7d98230..cca836c 100644
--- a/metadata/service/common/cluster.yml
+++ b/metadata/service/common/cluster.yml
@@ -5,6 +5,15 @@
     ceph_mon_node01_hostname: cmn01
     ceph_mon_node02_hostname: cmn02
     ceph_mon_node03_hostname: cmn03
+    ceph_cluster_member01:
+      name: ${_param:ceph_mon_node01_hostname}
+      host: ${_param:ceph_mon_node01_address}
+    ceph_cluster_member02:
+      name: ${_param:ceph_mon_node02_hostname}
+      host: ${_param:ceph_mon_node02_address}
+    ceph_cluster_member03:
+      name: ${_param:ceph_mon_node03_hostname}
+      host: ${_param:ceph_mon_node03_address}
   ceph:
     common:
       config:
@@ -14,9 +23,6 @@
       version: ${_param:ceph_version}
       fsid: ${_param:ceph_cluster_fsid}
       members:
-        - name: ${_param:ceph_mon_node01_hostname}
-          host: ${_param:ceph_mon_node01_ceph_public_address}
-        - name: ${_param:ceph_mon_node02_hostname}
-          host: ${_param:ceph_mon_node02_ceph_public_address}
-        - name: ${_param:ceph_mon_node03_hostname}
-          host: ${_param:ceph_mon_node03_ceph_public_address}
+        - ${_param:ceph_cluster_member01}
+        - ${_param:ceph_cluster_member02}
+        - ${_param:ceph_cluster_member03}

metadata/service/common/single.yml

diff --git a/metadata/service/common/single.yml b/metadata/service/common/single.yml
index c81947b..d5010f0 100644
--- a/metadata/service/common/single.yml
+++ b/metadata/service/common/single.yml
@@ -3,6 +3,9 @@
 parameters:
   _param:
     ceph_mon_node01_hostname: cmn01
+    ceph_cluster_member01:
+      name: ${_param:ceph_mon_node01_hostname}
+      host: ${_param:ceph_mon_node01_address}
   ceph:
     common:
       config:
@@ -12,5 +15,4 @@
       version: ${_param:ceph_version}
       fsid: ${_param:ceph_cluster_fsid}
       members:
-        - name: ${_param:ceph_mon_node01_hostname}
-          host: ${_param:ceph_mon_node01_address}
+        - ${_param:ceph_cluster_member01}