From f53e6b9ed2508624056aa9c9bac40b99283b5b3b Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 19 Aug 2019 15:34:07 +0200
Subject: [PATCH] Move cephfs and cephfs_*_pool ceph-ansible parameters in
 -base

We have to move these into the -base service so they are dumped in
"all" ansible group vars and correctly consumed by nfs role
when not colocated with mds.

Closes-Bug: 1840651
Change-Id: I7aec1b80e0f598fc86720d669151958ca7b2e01d
(cherry picked from commit 04b1378ea1217db32aad4f03ad360da4c4df24dd)
(cherry picked from commit 90e36a106a4adc69805b25ec68a9d5a76377c209)
(cherry picked from commit 3b61e285bec4490bbb3c9768ce19f32aae570fae)
---
 docker/services/ceph-ansible/ceph-base.yaml | 21 ++++++++++++++++++++
 docker/services/ceph-ansible/ceph-mds.yaml  | 22 +--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index fe646083bd..6b8174ea1f 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -134,6 +134,21 @@ parameters:
     description: default minimum replication for RBD copies
     type: number
     default: 3
+  ManilaCephFSDataPoolName:
+    default: manila_data
+    type: string
+  ManilaCephFSMetadataPoolName:
+    default: manila_metadata
+    type: string
+  ManilaCephFSDataPoolPGNum:
+    default: 128
+    type: number
+  ManilaCephFSMetadataPoolPGNum:
+    default: 128
+    type: number
+  ManilaCephFSShareBackendName:
+    default: cephfs
+    type: string
   ManilaCephFSCephFSAuthId:
     default: manila
     type: string
@@ -363,3 +378,9 @@ outputs:
             - {get_param: CephIPv6}
             - ipv6
             - ipv4
+          cephfs_data: {get_param: ManilaCephFSDataPoolName}
+          cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
+          cephfs: {get_param: ManilaCephFSShareBackendName}
+          cephfs_pools:
+          - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
+          - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml
index a325c65809..074f103a00 100644
--- a/docker/services/ceph-ansible/ceph-mds.yaml
+++ b/docker/services/ceph-ansible/ceph-mds.yaml
@@ -35,21 +35,6 @@ parameters:
                  with ceph-authtool --gen-print-key.
     type: string
     hidden: true
-  ManilaCephFSDataPoolName:
-    default: manila_data
-    type: string
-  ManilaCephFSDataPoolPGNum:
-    default: 128
-    type: number
-  ManilaCephFSMetadataPoolName:
-    default: manila_metadata
-    type: string
-  ManilaCephFSMetadataPoolPGNum:
-    default: 128
-    type: number
-  ManilaCephFSShareBackendName:
-    default: cephfs
-    type: string
 
 resources:
   CephBase:
@@ -83,9 +68,4 @@ outputs:
         - ceph_mds_ansible_vars:
             map_merge:
             - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - cephfs_data: {get_param: ManilaCephFSDataPoolName}
-              cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
-              cephfs: {get_param: ManilaCephFSShareBackendName}
-              cephfs_pools:
-              - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
-              - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
+            - {}