Airship-treasuremap: Ceph charts cleanup

This is  to clean ceph charts for unused variables and left over from
ceph chart split

Change-Id: I3155c9079ab4b0b4df30782335833389c452adfd

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

@@ -39,58 +39,13 @@ metadata:
         path: .values.network.cluster
 
     # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
 
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
-
-    # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
 
 data:
   chart_name: osh-infra-ceph-config
@@ -117,15 +72,6 @@ data:
       provisioner:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
-      mds:
-        node_selector_key: ceph-mds
-        node_selector_value: enabled
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
-      mgr:
-        node_selector_key: ceph-mgr
-        node_selector_value: enabled
     deployment:
       ceph: false
       client_secrets: true
@@ -134,9 +80,6 @@ data:
       rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: false
-    conf:
-      rgw_ks:
-        enabled: true
     storageclass:
       rbd:
         ceph_configmap_name: ceph-etc

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

@@ -39,58 +39,12 @@ metadata:
         path: .values.network.cluster
 
     # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
-
-    # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
 
 data:
   chart_name: openstack-ceph-config
@@ -117,15 +71,6 @@ data:
       provisioner:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
-      mds:
-        node_selector_key: ceph-mds
-        node_selector_value: enabled
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
-      mgr:
-        node_selector_key: ceph-mgr
-        node_selector_value: enabled
     deployment:
       ceph: false
       client_secrets: true
@@ -134,9 +79,6 @@ data:
       rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: false
-    conf:
-      rgw_ks:
-        enabled: true
     storageclass:
       rbd:
         ceph_configmap_name: ceph-etc

global/software/charts/osh/openstack-radosgw/radosgw.yaml

@@ -57,12 +57,6 @@ metadata:
         path: .ceph.tenant_ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.tenant_ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
 
     # Credentials
     - src:

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

@@ -38,18 +38,6 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
@@ -62,32 +50,8 @@ metadata:
         path: .ceph.tenant_ceph_mgr
       dest:
         path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -119,23 +83,13 @@ data:
       job:
         node_selector_key: tenant-ceph-control-plane
         node_selector_value: enabled
-      provisioner:
-        node_selector_key: tenant-ceph-control-plane
-        node_selector_value: enabled
       mds:
         node_selector_key: tenant-ceph-mds
         node_selector_value: enabled
-      rgw:
-        node_selector_key: tenant-ceph-rgw
-        node_selector_value: enabled
       mgr:
         node_selector_key: tenant-ceph-mgr
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: openstack
       ceph_mon:
         namespace: tenant-ceph
       ceph_mgr:

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

@@ -39,58 +39,12 @@ metadata:
         path: .values.network.cluster
 
     # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.tenant_ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.tenant_ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
-
-    # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
 
 data:
   chart_name: tenant-ceph-config
@@ -114,15 +68,9 @@ data:
       job:
         node_selector_key: tenant-ceph-control-plane
         node_selector_value: enabled
-      provisioner:
-        node_selector_key: tenant-ceph-control-plane
-        node_selector_value: enabled
       mds:
         node_selector_key: tenant-ceph-mds
         node_selector_value: enabled
-      rgw:
-        node_selector_key: tenant-ceph-rgw
-        node_selector_value: enabled
       mgr:
         node_selector_key: tenant-ceph-mgr
         node_selector_value: enabled
@@ -134,9 +82,6 @@ data:
       rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: false
-    conf:
-      rgw_ks:
-        enabled: true
     storageclass:
       rbd:
         ceph_configmap_name: tenant-ceph-etc

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

@@ -39,56 +39,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.tenant_ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.tenant_ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -124,10 +82,6 @@ data:
         node_selector_key: tenant-ceph-mon
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: openstack
       ceph_mon:
         namespace: tenant-ceph
       ceph_mgr:

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

@@ -39,56 +39,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.tenant_ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.tenant_ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -116,10 +74,6 @@ data:
         node_selector_key: tenant-ceph-osd
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: openstack
       ceph_mon:
         namespace: tenant-ceph
       ceph_mgr:

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

@@ -39,58 +39,13 @@ metadata:
         path: .values.network.cluster
 
     # Endpoints
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ucp.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
 
-    # Credentials
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ucp.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ceph.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
-
-    # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ucp_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
 
 data:
   chart_name: ucp-ceph-config
@@ -117,15 +72,6 @@ data:
       provisioner:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
-      mds:
-        node_selector_key: ceph-mds
-        node_selector_value: enabled
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
-      mgr:
-        node_selector_key: ceph-mgr
-        node_selector_value: enabled
     deployment:
       ceph: false
       client_secrets: true

global/software/charts/ucp/ceph/ceph-client-update.yaml

@@ -38,56 +38,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -119,23 +77,13 @@ data:
       job:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
-      provisioner:
-        node_selector_key: ucp-control-plane
-        node_selector_value: enabled
       mds:
         node_selector_key: ceph-mds
         node_selector_value: enabled
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
       mgr:
         node_selector_key: ceph-mgr
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     deployment:

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

@@ -38,18 +38,6 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
@@ -62,33 +50,8 @@ metadata:
         path: .ceph.ceph_mgr
       dest:
         path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -120,23 +83,13 @@ data:
       job:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
-      provisioner:
-        node_selector_key: ucp-control-plane
-        node_selector_value: enabled
       mds:
         node_selector_key: ceph-mds
         node_selector_value: enabled
-      rgw:
-        node_selector_key: ceph-rgw
-        node_selector_value: enabled
       mgr:
         node_selector_key: ceph-mgr
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     deployment:
@@ -147,7 +100,6 @@ data:
       replicas:
         mds: 1
         mgr: 1
-        rgw: 1
 
     conf:
       pool:

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

@@ -39,56 +39,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ucp.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ucp.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ceph.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ucp_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -124,10 +82,6 @@ data:
         node_selector_key: ceph-mon
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     deployment:

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

@@ -39,56 +39,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ucp.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ucp.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: ucp_service_accounts
-        path: .ceph.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ucp_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -116,10 +74,6 @@ data:
         node_selector_key: ceph-osd
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     bootstrap:

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

@@ -38,57 +38,14 @@ metadata:
         path: .storage.ceph.cluster_cidr
       dest:
         path: .values.network.cluster
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: osh_endpoints
-        path: .osh.identity
-      dest:
-        path: .values.endpoints.identity
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.object_store
-      dest:
-        path: .values.endpoints.object_store
     - src:
         schema: pegleg/EndpointCatalogue/v1
         name: ucp_endpoints
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.keystone.admin
-      dest:
-        path: .values.endpoints.identity.auth.admin
-
-    - src:
-        schema: pegleg/AccountCatalogue/v1
-        name: osh_service_accounts
-        path: .osh.swift.keystone
-      dest:
-        path: .values.endpoints.identity.auth.swift
 
     # Secrets
-    - dest:
-        path: .values.endpoints.identity.auth.admin.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: osh_keystone_admin_password
-        path: .
-    - dest:
-        path: .values.endpoints.identity.auth.swift.password
-      src:
-        schema: deckhand/Passphrase/v1
-        name: ceph_swift_keystone_password
-        path: .
     - dest:
        path: .values.conf.ceph.global.fsid
       src:
@@ -124,10 +81,6 @@ data:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     deployment:

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

@@ -57,12 +57,6 @@ metadata:
         path: .ceph.ceph_mon
       dest:
         path: .values.endpoints.ceph_mon
-    - src:
-        schema: pegleg/EndpointCatalogue/v1
-        name: ucp_endpoints
-        path: .ceph.ceph_mgr
-      dest:
-        path: .values.endpoints.ceph_mgr
 
     # Credentials
     - src: