Browse Source

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

tags/10.6.1
Zuul 3 weeks ago
parent
commit
2c7d6ec8c5
2 changed files with 47 additions and 53 deletions
  1. 46
    0
      deployment/ceph-ansible/ceph-base.yaml
  2. 1
    53
      deployment/ceph-ansible/ceph-mds.yaml

+ 46
- 0
deployment/ceph-ansible/ceph-base.yaml View File

@@ -141,6 +141,22 @@ parameters:
141 141
     description: default minimum replication for RBD copies
142 142
     type: number
143 143
     default: 3
144
+  ManilaCephFSDataPoolName:
145
+    default: manila_data
146
+    type: string
147
+  ManilaCephFSMetadataPoolName:
148
+    default: manila_metadata
149
+    type: string
150
+  # DEPRECATED options for compatibility with older versions
151
+  ManilaCephFSDataPoolPGNum:
152
+    default: 128
153
+    type: number
154
+  ManilaCephFSMetadataPoolPGNum:
155
+    default: 128
156
+    type: number
157
+  ManilaCephFSShareBackendName:
158
+    default: cephfs
159
+    type: string
144 160
   ManilaCephFSCephFSAuthId:
145 161
     default: manila
146 162
     type: string
@@ -187,7 +203,16 @@ parameters:
187 203
                  container is able to read/write to /var/lib/mistral/ceph_fetch
188 204
     type: string
189 205
 
206
+parameter_groups:
207
+- label: deprecated
208
+  description: Do not use deprecated params, they will be removed.
209
+  parameters:
210
+  - ManilaCephFSDataPoolPGNum
211
+  - ManilaCephFSMetadataPoolPGNum
212
+
190 213
 conditions:
214
+  deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
215
+  deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
191 216
   custom_registry_host:
192 217
     yaql:
193 218
       data: {get_param: DockerCephDaemonImage}
@@ -376,6 +401,27 @@ resources:
376 401
             - ipv6
377 402
             - ipv4
378 403
           dashboard_enabled: false
404
+          # Prefer CephPoolDefaultPgNum unless the (deprecated)
405
+          # params value is different from their default.
406
+          cephfs_data_pool:
407
+            application: cephfs
408
+            name: {get_param: ManilaCephFSDataPoolName}
409
+            pg_num:
410
+              if:
411
+              - deprecated_data_pool_pgnum
412
+              - {get_param: ManilaCephFSDataPoolPGNum}
413
+              - {get_param: CephPoolDefaultPgNum}
414
+            rule_name: replicated_rule
415
+          cephfs_metadata_pool:
416
+            application: cephfs
417
+            name: {get_param: ManilaCephFSMetadataPoolName}
418
+            pg_num:
419
+              if:
420
+              - deprecated_metadata_pool_pgnum
421
+              - {get_param: ManilaCephFSMetadataPoolPGNum}
422
+              - {get_param: CephPoolDefaultPgNum}
423
+            rule_name: replicated_rule
424
+          cephfs: {get_param: ManilaCephFSShareBackendName}
379 425
 
380 426
 outputs:
381 427
   role_data:

+ 1
- 53
deployment/ceph-ansible/ceph-mds.yaml View File

@@ -35,37 +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
-  ManilaCephFSMetadataPoolName:
42
-    default: manila_metadata
43
-    type: string
44
-  ManilaCephFSShareBackendName:
45
-    default: cephfs
46
-    type: string
47
-  CephPoolDefaultPgNum:
48
-    description: default pg_num to use for the RBD pools
49
-    type: number
50
-    default: 128
51
-  # DEPRECATED options for compatibility with older versions
52
-  ManilaCephFSDataPoolPGNum:
53
-    default: 128
54
-    type: number
55
-  ManilaCephFSMetadataPoolPGNum:
56
-    default: 128
57
-    type: number
58
-
59
-parameter_groups:
60
-- label: deprecated
61
-  description: Do not use deprecated params, they will be removed.
62
-  parameters:
63
-  - ManilaCephFSDataPoolPGNum
64
-  - ManilaCephFSMetadataPoolPGNum
65
-
66
-conditions:
67
-  deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
68
-  deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
69 38
 
70 39
 resources:
71 40
   CephBase:
@@ -83,28 +52,7 @@ resources:
83 52
     properties:
84 53
       type: json
85 54
       value:
86
-        vars:
87
-          # Prefer CephPoolDefaultPgNum unless the (deprecated)
88
-          # params value is different from their default.
89
-          cephfs_data_pool:
90
-            application: cephfs
91
-            name: {get_param: ManilaCephFSDataPoolName}
92
-            pg_num:
93
-              if:
94
-              - deprecated_data_pool_pgnum
95
-              - {get_param: ManilaCephFSDataPoolPGNum}
96
-              - {get_param: CephPoolDefaultPgNum}
97
-            rule_name: replicated_rule
98
-          cephfs_metadata_pool:
99
-            application: cephfs
100
-            name: {get_param: ManilaCephFSMetadataPoolName}
101
-            pg_num:
102
-              if:
103
-              - deprecated_metadata_pool_pgnum
104
-              - {get_param: ManilaCephFSMetadataPoolPGNum}
105
-              - {get_param: CephPoolDefaultPgNum}
106
-            rule_name: replicated_rule
107
-          cephfs: {get_param: ManilaCephFSShareBackendName}
55
+        vars: {}
108 56
 
109 57
 outputs:
110 58
   role_data:

Loading…
Cancel
Save