Browse Source

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

tags/9.4.1
Zuul 3 weeks ago
parent
commit
69daaaeb38

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

@@ -135,6 +135,21 @@ parameters:
135 135
     description: default minimum replication for RBD copies
136 136
     type: number
137 137
     default: 3
138
+  ManilaCephFSDataPoolName:
139
+    default: manila_data
140
+    type: string
141
+  ManilaCephFSMetadataPoolName:
142
+    default: manila_metadata
143
+    type: string
144
+  ManilaCephFSDataPoolPGNum:
145
+    default: 128
146
+    type: number
147
+  ManilaCephFSMetadataPoolPGNum:
148
+    default: 128
149
+    type: number
150
+  ManilaCephFSShareBackendName:
151
+    default: cephfs
152
+    type: string
138 153
   ManilaCephFSCephFSAuthId:
139 154
     default: manila
140 155
     type: string
@@ -357,6 +372,12 @@ resources:
357 372
             - {get_param: CephIPv6}
358 373
             - ipv6
359 374
             - ipv4
375
+          cephfs_data: {get_param: ManilaCephFSDataPoolName}
376
+          cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
377
+          cephfs: {get_param: ManilaCephFSShareBackendName}
378
+          cephfs_pools:
379
+          - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
380
+          - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
360 381
 
361 382
 outputs:
362 383
   role_data:

+ 1
- 22
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:
@@ -67,13 +52,7 @@ resources:
67 52
     properties:
68 53
       type: json
69 54
       value:
70
-        vars:
71
-          cephfs_data: {get_param: ManilaCephFSDataPoolName}
72
-          cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
73
-          cephfs: {get_param: ManilaCephFSShareBackendName}
74
-          cephfs_pools:
75
-          - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
76
-          - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
55
+        vars: {}
77 56
 
78 57
 outputs:
79 58
   role_data:

Loading…
Cancel
Save