Merge "Move ceph-rgw and config overrides variables"

ci/environments/scenario001-standalone.yaml

@@ -184,8 +184,10 @@ parameter_defaults:
     - tty6
   ContainerCli: podman
   CephConfigOverrides:
+    anotherkey: anothervalue
     global:
       globalkey: globalvalue
     osd:
       osdkey: osdvalue
+    foo: bar
   NfsUrl: 127.0.0.1

ci/environments/scenario004-standalone.yaml

@@ -96,3 +96,4 @@ parameter_defaults:
     - tty6
   CephConfigOverrides:
     globalkey: globalvalue
+    anotherkey: anothervalue

deployment/ceph-ansible/ceph-base.yaml

@@ -347,10 +347,6 @@ conditions:
       equals:
         - {get_param: CephAnsibleSkipTags}
         - ''
-  ceph_config_overrides_with_sections:
-    yaql:
-      data: {get_param: CephConfigOverrides}
-      expression: $.data.keys().any(predicate => $ in ['global', 'mon', 'mgr', 'osd', 'mds', 'client'])
   ceph_authenticated_registry:
       and:
       - not:
@@ -404,24 +400,11 @@ resources:
     properties:
       type: json
       value:
-        global:
-          osd_pool_default_size: {get_param: CephPoolDefaultSize}
-          osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
-          osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
-          rgw_keystone_api_version: 3
-          rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
-          rgw_keystone_accepted_roles: 'member, Member, admin'
-          rgw_keystone_accepted_admin_roles: ResellerAdmin, swiftoperator
-          rgw_keystone_admin_domain: default
-          rgw_keystone_admin_project: service
-          rgw_keystone_admin_user: swift
-          rgw_keystone_admin_password: {get_param: SwiftPassword}
-          rgw_keystone_implicit_tenants: 'true'
-          rgw_keystone_revocation_interval: '0'
-          rgw_s3_auth_use_keystone: 'true'
-          rgw_swift_versioning_enabled: 'true'
-          rgw_swift_account_in_url: 'true'
-          rgw_trust_forwarded_https: 'true'
+        vars:
+          global:
+            osd_pool_default_size: {get_param: CephPoolDefaultSize}
+            osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
+            osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
 
   CephBasePoolVars:
     type: OS::Heat::Value
@@ -551,20 +534,6 @@ resources:
             list_join:
               - ','
               - get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]
-          ceph_conf_overrides:
-            if:
-            - ceph_config_overrides_with_sections
-            - yaql:
-                data:
-                  default:
-                    map_merge:
-                    - {get_attr: [DefaultCephConfigOverrides, value]}
-                  overrides: {get_param: CephConfigOverrides}
-                expression: $.data.default.mergeWith($.data.overrides)
-            - global:
-                map_merge:
-                - {get_attr: [DefaultCephConfigOverrides, value, global]}
-                - {get_param: CephConfigOverrides}
           ip_version:
             if:
             - {get_param: CephIPv6}
@@ -618,6 +587,8 @@ outputs:
                 ceph_pools: {get_attr: [CephBasePoolVars, value, vars]}
                 manila_pools: {get_attr: [CephManilaPoolVars, value, vars]}
                 ceph_keys: {get_attr: [CephKeyVars, value, vars]}
+                ceph_default_overrides: {get_attr: [DefaultCephConfigOverrides, value, vars]}
+                ceph_config_overrides: {get_param: CephConfigOverrides}
             - name: set ceph-ansible facts
               set_fact:
                 blacklisted_hostnames: {get_param: DeploymentServerBlacklist}

deployment/ceph-ansible/ceph-rgw.yaml

@@ -75,6 +75,28 @@ resources:
               - get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephRgwNetwork]}]
           radosgw_frontend_port: {get_param: [EndpointMap, CephRgwInternal, port]}
 
+  CephRgwConfigOverrides:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        vars:
+          global:
+            rgw_keystone_api_version: 3
+            rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            rgw_keystone_accepted_roles: 'member, Member, admin'
+            rgw_keystone_accepted_admin_roles: ResellerAdmin, swiftoperator
+            rgw_keystone_admin_domain: default
+            rgw_keystone_admin_project: service
+            rgw_keystone_admin_user: swift
+            rgw_keystone_admin_password: {get_param: SwiftPassword}
+            rgw_keystone_implicit_tenants: 'true'
+            rgw_keystone_revocation_interval: '0'
+            rgw_s3_auth_use_keystone: 'true'
+            rgw_swift_versioning_enabled: 'true'
+            rgw_swift_account_in_url: 'true'
+            rgw_trust_forwarded_https: 'true'
+
 outputs:
   role_data:
     description: Role data for the Ceph RadosGW service.
@@ -129,6 +151,7 @@ outputs:
                       - {get_attr: [CephRgwAnsibleVars, value, vars]}
                       - radosgw_frontend_ssl_certificate: '/etc/pki/tls/certs/ceph_rgw.pem'
                     - {get_attr: [CephRgwAnsibleVars, value, vars]}
+                  ceph_rgw_config_overrides: {get_attr: [CephRgwConfigOverrides, value, vars]}
               - name: generate ceph-ansible group vars rgws
                 copy:
                   dest: "{{playbook_dir}}/ceph-ansible/group_vars/rgws.yml"