Merge "Ceph: uplift ceph charts"

global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml

@@ -83,7 +83,8 @@ data:
     storageclass:
       rbd:
         ceph_configmap_name: ceph-etc
-        user_secret_name: pvc-ceph-client-key
+        parameters:
+          userSecretName: pvc-ceph-client-key
   dependencies:
     - ceph-htk
 ...

global/software/charts/osh/openstack-ceph-config/ceph-config.yaml

@@ -85,7 +85,8 @@ data:
     storageclass:
       rbd:
         ceph_configmap_name: ceph-etc
-        user_secret_name: pvc-ceph-client-key
+        parameters:
+          userSecretName: pvc-ceph-client-key
   dependencies:
     - ceph-htk
 ...

global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml

@@ -85,8 +85,9 @@ data:
     storageclass:
       rbd:
         ceph_configmap_name: tenant-ceph-etc
-        user_secret_name: pvc-tceph-client-key
+        parameters:
-        admin_secret_namespace: tenant-ceph
+          userSecretName: pvc-tceph-client-key
+          adminSecretNamespace: tenant-ceph
   dependencies:
     - tenant-ceph-htk
 ...

global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml

@@ -98,7 +98,8 @@ data:
           log_directory: /var/log/tenant-ceph
     storageclass:
       rbd:
-        admin_secret_namespace: tenant-ceph
+        parameters:
+          adminSecretNamespace: tenant-ceph
     deployment:
       ceph: true
       storage_secrets: true

global/software/charts/ucp/ceph-config/ceph-config.yaml

@@ -89,7 +89,8 @@ data:
     storageclass:
       rbd:
         ceph_configmap_name: ceph-etc
-        user_secret_name: pvc-ceph-client-key
+        parameters:
+          userSecretName: pvc-ceph-client-key
   dependencies:
     - ceph-htk
 ...

global/software/charts/ucp/ceph/ceph-provisioners.yaml

@@ -102,7 +102,8 @@ data:
     storageclass:
       rbd:
         ceph_configmap_name: ceph-client-keys-etc
-        user_secret_name: pvc-ceph-client-key
+        parameters:
+          userSecretName: pvc-ceph-client-key
   dependencies:
     - ceph-htk
 ...

global/software/config/versions.yaml

@@ -348,32 +348,32 @@ data:
         type: git
       ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -498,32 +498,32 @@ data:
         type: git
       tenant-ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
+        reference: 273b30706b97fcaa66cc5e58c4433275e57618a0
         subpath: ceph-rgw
         type: git
       tiller: