Browse Source

Merge "Move cephfs and cephfs_*_pool ceph-ansible parameters in -base" into stable/queens

tags/8.4.1
Zuul 3 weeks ago
parent
commit
b64c0f238f

+ 21
- 0
docker/services/ceph-ansible/ceph-base.yaml View File

@@ -134,6 +134,21 @@ parameters:
134 134
     description: default minimum replication for RBD copies
135 135
     type: number
136 136
     default: 3
137
+  ManilaCephFSDataPoolName:
138
+    default: manila_data
139
+    type: string
140
+  ManilaCephFSMetadataPoolName:
141
+    default: manila_metadata
142
+    type: string
143
+  ManilaCephFSDataPoolPGNum:
144
+    default: 128
145
+    type: number
146
+  ManilaCephFSMetadataPoolPGNum:
147
+    default: 128
148
+    type: number
149
+  ManilaCephFSShareBackendName:
150
+    default: cephfs
151
+    type: string
137 152
   ManilaCephFSCephFSAuthId:
138 153
     default: manila
139 154
     type: string
@@ -363,3 +378,9 @@ outputs:
363 378
             - {get_param: CephIPv6}
364 379
             - ipv6
365 380
             - ipv4
381
+          cephfs_data: {get_param: ManilaCephFSDataPoolName}
382
+          cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
383
+          cephfs: {get_param: ManilaCephFSShareBackendName}
384
+          cephfs_pools:
385
+          - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
386
+          - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }

+ 1
- 21
docker/services/ceph-ansible/ceph-mds.yaml View File

@@ -35,21 +35,6 @@ parameters:
35 35
                  with ceph-authtool --gen-print-key.
36 36
     type: string
37 37
     hidden: true
38
-  ManilaCephFSDataPoolName:
39
-    default: manila_data
40
-    type: string
41
-  ManilaCephFSDataPoolPGNum:
42
-    default: 128
43
-    type: number
44
-  ManilaCephFSMetadataPoolName:
45
-    default: manila_metadata
46
-    type: string
47
-  ManilaCephFSMetadataPoolPGNum:
48
-    default: 128
49
-    type: number
50
-  ManilaCephFSShareBackendName:
51
-    default: cephfs
52
-    type: string
53 38
 
54 39
 resources:
55 40
   CephBase:
@@ -83,9 +68,4 @@ outputs:
83 68
         - ceph_mds_ansible_vars:
84 69
             map_merge:
85 70
             - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
86
-            - cephfs_data: {get_param: ManilaCephFSDataPoolName}
87
-              cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
88
-              cephfs: {get_param: ManilaCephFSShareBackendName}
89
-              cephfs_pools:
90
-              - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
91
-              - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
71
+            - {}

Loading…
Cancel
Save