Browse Source

Airship-treasuremap: Ceph charts cleanup

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

Change-Id: I3155c9079ab4b0b4df30782335833389c452adfd
Chinasubbareddy M 3 months ago
parent
commit
f96c3016a0

+ 0
- 57
global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml View File

@@ -39,58 +39,13 @@ metadata:
39 39
         path: .values.network.cluster
40 40
 
41 41
     # Endpoints
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: osh_endpoints
45
-        path: .osh.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: osh_endpoints
51
-        path: .osh.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66 48
 
67
-    # Credentials
68
-    - src:
69
-        schema: pegleg/AccountCatalogue/v1
70
-        name: osh_service_accounts
71
-        path: .osh.keystone.admin
72
-      dest:
73
-        path: .values.endpoints.identity.auth.admin
74
-    - src:
75
-        schema: pegleg/AccountCatalogue/v1
76
-        name: osh_service_accounts
77
-        path: .osh.swift.keystone
78
-      dest:
79
-        path: .values.endpoints.identity.auth.swift
80
-
81
-    # Secrets
82
-    - dest:
83
-        path: .values.endpoints.identity.auth.admin.password
84
-      src:
85
-        schema: deckhand/Passphrase/v1
86
-        name: osh_keystone_admin_password
87
-        path: .
88
-    - dest:
89
-        path: .values.endpoints.identity.auth.swift.password
90
-      src:
91
-        schema: deckhand/Passphrase/v1
92
-        name: ceph_swift_keystone_password
93
-        path: .
94 49
 
95 50
 data:
96 51
   chart_name: osh-infra-ceph-config
@@ -117,15 +72,6 @@ data:
117 72
       provisioner:
118 73
         node_selector_key: openstack-control-plane
119 74
         node_selector_value: enabled
120
-      mds:
121
-        node_selector_key: ceph-mds
122
-        node_selector_value: enabled
123
-      rgw:
124
-        node_selector_key: ceph-rgw
125
-        node_selector_value: enabled
126
-      mgr:
127
-        node_selector_key: ceph-mgr
128
-        node_selector_value: enabled
129 75
     deployment:
130 76
       ceph: false
131 77
       client_secrets: true
@@ -134,9 +80,6 @@ data:
134 80
       rgw_keystone_user_and_endpoints: false
135 81
     bootstrap:
136 82
       enabled: false
137
-    conf:
138
-      rgw_ks:
139
-        enabled: true
140 83
     storageclass:
141 84
       rbd:
142 85
         ceph_configmap_name: ceph-etc

+ 0
- 58
global/software/charts/osh/openstack-ceph-config/ceph-config.yaml View File

@@ -39,58 +39,12 @@ metadata:
39 39
         path: .values.network.cluster
40 40
 
41 41
     # Endpoints
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: osh_endpoints
45
-        path: .osh.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: osh_endpoints
51
-        path: .osh.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-
67
-    # Credentials
68
-    - src:
69
-        schema: pegleg/AccountCatalogue/v1
70
-        name: osh_service_accounts
71
-        path: .osh.keystone.admin
72
-      dest:
73
-        path: .values.endpoints.identity.auth.admin
74
-    - src:
75
-        schema: pegleg/AccountCatalogue/v1
76
-        name: osh_service_accounts
77
-        path: .osh.swift.keystone
78
-      dest:
79
-        path: .values.endpoints.identity.auth.swift
80
-
81
-    # Secrets
82
-    - dest:
83
-        path: .values.endpoints.identity.auth.admin.password
84
-      src:
85
-        schema: deckhand/Passphrase/v1
86
-        name: osh_keystone_admin_password
87
-        path: .
88
-    - dest:
89
-        path: .values.endpoints.identity.auth.swift.password
90
-      src:
91
-        schema: deckhand/Passphrase/v1
92
-        name: ceph_swift_keystone_password
93
-        path: .
94 48
 
95 49
 data:
96 50
   chart_name: openstack-ceph-config
@@ -117,15 +71,6 @@ data:
117 71
       provisioner:
118 72
         node_selector_key: openstack-control-plane
119 73
         node_selector_value: enabled
120
-      mds:
121
-        node_selector_key: ceph-mds
122
-        node_selector_value: enabled
123
-      rgw:
124
-        node_selector_key: ceph-rgw
125
-        node_selector_value: enabled
126
-      mgr:
127
-        node_selector_key: ceph-mgr
128
-        node_selector_value: enabled
129 74
     deployment:
130 75
       ceph: false
131 76
       client_secrets: true
@@ -134,9 +79,6 @@ data:
134 79
       rgw_keystone_user_and_endpoints: false
135 80
     bootstrap:
136 81
       enabled: false
137
-    conf:
138
-      rgw_ks:
139
-        enabled: true
140 82
     storageclass:
141 83
       rbd:
142 84
         ceph_configmap_name: ceph-etc

+ 0
- 6
global/software/charts/osh/openstack-radosgw/radosgw.yaml View File

@@ -57,12 +57,6 @@ metadata:
57 57
         path: .ceph.tenant_ceph_mon
58 58
       dest:
59 59
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.tenant_ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66 60
 
67 61
     # Credentials
68 62
     - src:

+ 0
- 46
global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml View File

@@ -38,18 +38,6 @@ metadata:
38 38
         path: .storage.ceph.cluster_cidr
39 39
       dest:
40 40
         path: .values.network.cluster
41
-    - src:
42
-        schema: pegleg/EndpointCatalogue/v1
43
-        name: osh_endpoints
44
-        path: .osh.identity
45
-      dest:
46
-        path: .values.endpoints.identity
47
-    - src:
48
-        schema: pegleg/EndpointCatalogue/v1
49
-        name: osh_endpoints
50
-        path: .osh.object_store
51
-      dest:
52
-        path: .values.endpoints.object_store
53 41
     - src:
54 42
         schema: pegleg/EndpointCatalogue/v1
55 43
         name: ucp_endpoints
@@ -62,32 +50,8 @@ metadata:
62 50
         path: .ceph.tenant_ceph_mgr
63 51
       dest:
64 52
         path: .values.endpoints.ceph_mgr
65
-    - src:
66
-        schema: pegleg/AccountCatalogue/v1
67
-        name: osh_service_accounts
68
-        path: .osh.keystone.admin
69
-      dest:
70
-        path: .values.endpoints.identity.auth.admin
71
-    - src:
72
-        schema: pegleg/AccountCatalogue/v1
73
-        name: osh_service_accounts
74
-        path: .osh.swift.keystone
75
-      dest:
76
-        path: .values.endpoints.identity.auth.swift
77 53
 
78 54
     # Secrets
79
-    - dest:
80
-        path: .values.endpoints.identity.auth.admin.password
81
-      src:
82
-        schema: deckhand/Passphrase/v1
83
-        name: osh_keystone_admin_password
84
-        path: .
85
-    - dest:
86
-        path: .values.endpoints.identity.auth.swift.password
87
-      src:
88
-        schema: deckhand/Passphrase/v1
89
-        name: ceph_swift_keystone_password
90
-        path: .
91 55
     - dest:
92 56
        path: .values.conf.ceph.global.fsid
93 57
       src:
@@ -119,23 +83,13 @@ data:
119 83
       job:
120 84
         node_selector_key: tenant-ceph-control-plane
121 85
         node_selector_value: enabled
122
-      provisioner:
123
-        node_selector_key: tenant-ceph-control-plane
124
-        node_selector_value: enabled
125 86
       mds:
126 87
         node_selector_key: tenant-ceph-mds
127 88
         node_selector_value: enabled
128
-      rgw:
129
-        node_selector_key: tenant-ceph-rgw
130
-        node_selector_value: enabled
131 89
       mgr:
132 90
         node_selector_key: tenant-ceph-mgr
133 91
         node_selector_value: enabled
134 92
     endpoints:
135
-      identity:
136
-        namespace: openstack
137
-      object_store:
138
-        namespace: openstack
139 93
       ceph_mon:
140 94
         namespace: tenant-ceph
141 95
       ceph_mgr:

+ 0
- 55
global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml View File

@@ -39,58 +39,12 @@ metadata:
39 39
         path: .values.network.cluster
40 40
 
41 41
     # Endpoints
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: osh_endpoints
45
-        path: .osh.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: osh_endpoints
51
-        path: .osh.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.tenant_ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.tenant_ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-
67
-    # Credentials
68
-    - src:
69
-        schema: pegleg/AccountCatalogue/v1
70
-        name: osh_service_accounts
71
-        path: .osh.keystone.admin
72
-      dest:
73
-        path: .values.endpoints.identity.auth.admin
74
-    - src:
75
-        schema: pegleg/AccountCatalogue/v1
76
-        name: osh_service_accounts
77
-        path: .osh.swift.keystone
78
-      dest:
79
-        path: .values.endpoints.identity.auth.swift
80
-
81
-    # Secrets
82
-    - dest:
83
-        path: .values.endpoints.identity.auth.admin.password
84
-      src:
85
-        schema: deckhand/Passphrase/v1
86
-        name: osh_keystone_admin_password
87
-        path: .
88
-    - dest:
89
-        path: .values.endpoints.identity.auth.swift.password
90
-      src:
91
-        schema: deckhand/Passphrase/v1
92
-        name: ceph_swift_keystone_password
93
-        path: .
94 48
 
95 49
 data:
96 50
   chart_name: tenant-ceph-config
@@ -114,15 +68,9 @@ data:
114 68
       job:
115 69
         node_selector_key: tenant-ceph-control-plane
116 70
         node_selector_value: enabled
117
-      provisioner:
118
-        node_selector_key: tenant-ceph-control-plane
119
-        node_selector_value: enabled
120 71
       mds:
121 72
         node_selector_key: tenant-ceph-mds
122 73
         node_selector_value: enabled
123
-      rgw:
124
-        node_selector_key: tenant-ceph-rgw
125
-        node_selector_value: enabled
126 74
       mgr:
127 75
         node_selector_key: tenant-ceph-mgr
128 76
         node_selector_value: enabled
@@ -134,9 +82,6 @@ data:
134 82
       rgw_keystone_user_and_endpoints: false
135 83
     bootstrap:
136 84
       enabled: false
137
-    conf:
138
-      rgw_ks:
139
-        enabled: true
140 85
     storageclass:
141 86
       rbd:
142 87
         ceph_configmap_name: tenant-ceph-etc

+ 0
- 46
global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml View File

@@ -39,56 +39,14 @@ metadata:
39 39
         path: .storage.ceph.cluster_cidr
40 40
       dest:
41 41
         path: .values.network.cluster
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: osh_endpoints
45
-        path: .osh.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: osh_endpoints
51
-        path: .osh.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.tenant_ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.tenant_ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-    - src:
67
-        schema: pegleg/AccountCatalogue/v1
68
-        name: osh_service_accounts
69
-        path: .osh.keystone.admin
70
-      dest:
71
-        path: .values.endpoints.identity.auth.admin
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: osh_service_accounts
75
-        path: .osh.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 48
 
79 49
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: osh_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 50
     - dest:
93 51
        path: .values.conf.ceph.global.fsid
94 52
       src:
@@ -124,10 +82,6 @@ data:
124 82
         node_selector_key: tenant-ceph-mon
125 83
         node_selector_value: enabled
126 84
     endpoints:
127
-      identity:
128
-        namespace: openstack
129
-      object_store:
130
-        namespace: openstack
131 85
       ceph_mon:
132 86
         namespace: tenant-ceph
133 87
       ceph_mgr:

+ 0
- 46
global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml View File

@@ -39,56 +39,14 @@ metadata:
39 39
         path: .storage.ceph.cluster_cidr
40 40
       dest:
41 41
         path: .values.network.cluster
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: osh_endpoints
45
-        path: .osh.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: osh_endpoints
51
-        path: .osh.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.tenant_ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.tenant_ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-    - src:
67
-        schema: pegleg/AccountCatalogue/v1
68
-        name: osh_service_accounts
69
-        path: .osh.keystone.admin
70
-      dest:
71
-        path: .values.endpoints.identity.auth.admin
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: osh_service_accounts
75
-        path: .osh.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 48
 
79 49
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: osh_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 50
     - dest:
93 51
        path: .values.conf.ceph.global.fsid
94 52
       src:
@@ -116,10 +74,6 @@ data:
116 74
         node_selector_key: tenant-ceph-osd
117 75
         node_selector_value: enabled
118 76
     endpoints:
119
-      identity:
120
-        namespace: openstack
121
-      object_store:
122
-        namespace: openstack
123 77
       ceph_mon:
124 78
         namespace: tenant-ceph
125 79
       ceph_mgr:

+ 0
- 54
global/software/charts/ucp/ceph-config/ceph-config.yaml View File

@@ -39,58 +39,13 @@ metadata:
39 39
         path: .values.network.cluster
40 40
 
41 41
     # Endpoints
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: ucp_endpoints
45
-        path: .ucp.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: ucp_endpoints
51
-        path: .ceph.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-
67
-    # Credentials
68
-    - src:
69
-        schema: pegleg/AccountCatalogue/v1
70
-        name: ucp_service_accounts
71
-        path: .ucp.keystone.admin
72
-      dest:
73
-        path: .values.endpoints.identity.auth.admin
74
-    - src:
75
-        schema: pegleg/AccountCatalogue/v1
76
-        name: ucp_service_accounts
77
-        path: .ceph.swift.keystone
78
-      dest:
79
-        path: .values.endpoints.identity.auth.swift
80 48
 
81
-    # Secrets
82
-    - dest:
83
-        path: .values.endpoints.identity.auth.admin.password
84
-      src:
85
-        schema: deckhand/Passphrase/v1
86
-        name: ucp_keystone_admin_password
87
-        path: .
88
-    - dest:
89
-        path: .values.endpoints.identity.auth.swift.password
90
-      src:
91
-        schema: deckhand/Passphrase/v1
92
-        name: ceph_swift_keystone_password
93
-        path: .
94 49
 
95 50
 data:
96 51
   chart_name: ucp-ceph-config
@@ -117,15 +72,6 @@ data:
117 72
       provisioner:
118 73
         node_selector_key: ucp-control-plane
119 74
         node_selector_value: enabled
120
-      mds:
121
-        node_selector_key: ceph-mds
122
-        node_selector_value: enabled
123
-      rgw:
124
-        node_selector_key: ceph-rgw
125
-        node_selector_value: enabled
126
-      mgr:
127
-        node_selector_key: ceph-mgr
128
-        node_selector_value: enabled
129 75
     deployment:
130 76
       ceph: false
131 77
       client_secrets: true

+ 0
- 52
global/software/charts/ucp/ceph/ceph-client-update.yaml View File

@@ -38,56 +38,14 @@ metadata:
38 38
         path: .storage.ceph.cluster_cidr
39 39
       dest:
40 40
         path: .values.network.cluster
41
-    - src:
42
-        schema: pegleg/EndpointCatalogue/v1
43
-        name: osh_endpoints
44
-        path: .osh.identity
45
-      dest:
46
-        path: .values.endpoints.identity
47
-    - src:
48
-        schema: pegleg/EndpointCatalogue/v1
49
-        name: ucp_endpoints
50
-        path: .ceph.object_store
51
-      dest:
52
-        path: .values.endpoints.object_store
53 41
     - src:
54 42
         schema: pegleg/EndpointCatalogue/v1
55 43
         name: ucp_endpoints
56 44
         path: .ceph.ceph_mon
57 45
       dest:
58 46
         path: .values.endpoints.ceph_mon
59
-    - src:
60
-        schema: pegleg/EndpointCatalogue/v1
61
-        name: ucp_endpoints
62
-        path: .ceph.ceph_mgr
63
-      dest:
64
-        path: .values.endpoints.ceph_mgr
65
-    - src:
66
-        schema: pegleg/AccountCatalogue/v1
67
-        name: osh_service_accounts
68
-        path: .osh.keystone.admin
69
-      dest:
70
-        path: .values.endpoints.identity.auth.admin
71
-    - src:
72
-        schema: pegleg/AccountCatalogue/v1
73
-        name: osh_service_accounts
74
-        path: .osh.swift.keystone
75
-      dest:
76
-        path: .values.endpoints.identity.auth.swift
77 47
 
78 48
     # Secrets
79
-    - dest:
80
-        path: .values.endpoints.identity.auth.admin.password
81
-      src:
82
-        schema: deckhand/Passphrase/v1
83
-        name: osh_keystone_admin_password
84
-        path: .
85
-    - dest:
86
-        path: .values.endpoints.identity.auth.swift.password
87
-      src:
88
-        schema: deckhand/Passphrase/v1
89
-        name: ceph_swift_keystone_password
90
-        path: .
91 49
     - dest:
92 50
        path: .values.conf.ceph.global.fsid
93 51
       src:
@@ -119,23 +77,13 @@ data:
119 77
       job:
120 78
         node_selector_key: ucp-control-plane
121 79
         node_selector_value: enabled
122
-      provisioner:
123
-        node_selector_key: ucp-control-plane
124
-        node_selector_value: enabled
125 80
       mds:
126 81
         node_selector_key: ceph-mds
127 82
         node_selector_value: enabled
128
-      rgw:
129
-        node_selector_key: ceph-rgw
130
-        node_selector_value: enabled
131 83
       mgr:
132 84
         node_selector_key: ceph-mgr
133 85
         node_selector_value: enabled
134 86
     endpoints:
135
-      identity:
136
-        namespace: openstack
137
-      object_store:
138
-        namespace: ceph
139 87
       ceph_mon:
140 88
         namespace: ceph
141 89
     deployment:

+ 0
- 48
global/software/charts/ucp/ceph/ceph-client.yaml View File

@@ -38,18 +38,6 @@ metadata:
38 38
         path: .storage.ceph.cluster_cidr
39 39
       dest:
40 40
         path: .values.network.cluster
41
-    - src:
42
-        schema: pegleg/EndpointCatalogue/v1
43
-        name: osh_endpoints
44
-        path: .osh.identity
45
-      dest:
46
-        path: .values.endpoints.identity
47
-    - src:
48
-        schema: pegleg/EndpointCatalogue/v1
49
-        name: ucp_endpoints
50
-        path: .ceph.object_store
51
-      dest:
52
-        path: .values.endpoints.object_store
53 41
     - src:
54 42
         schema: pegleg/EndpointCatalogue/v1
55 43
         name: ucp_endpoints
@@ -62,33 +50,8 @@ metadata:
62 50
         path: .ceph.ceph_mgr
63 51
       dest:
64 52
         path: .values.endpoints.ceph_mgr
65
-    - src:
66
-        schema: pegleg/AccountCatalogue/v1
67
-        name: osh_service_accounts
68
-        path: .osh.keystone.admin
69
-      dest:
70
-        path: .values.endpoints.identity.auth.admin
71
-
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: osh_service_accounts
75
-        path: .osh.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 53
 
79 54
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: osh_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 55
     - dest:
93 56
        path: .values.conf.ceph.global.fsid
94 57
       src:
@@ -120,23 +83,13 @@ data:
120 83
       job:
121 84
         node_selector_key: ucp-control-plane
122 85
         node_selector_value: enabled
123
-      provisioner:
124
-        node_selector_key: ucp-control-plane
125
-        node_selector_value: enabled
126 86
       mds:
127 87
         node_selector_key: ceph-mds
128 88
         node_selector_value: enabled
129
-      rgw:
130
-        node_selector_key: ceph-rgw
131
-        node_selector_value: enabled
132 89
       mgr:
133 90
         node_selector_key: ceph-mgr
134 91
         node_selector_value: enabled
135 92
     endpoints:
136
-      identity:
137
-        namespace: openstack
138
-      object_store:
139
-        namespace: ceph
140 93
       ceph_mon:
141 94
         namespace: ceph
142 95
     deployment:
@@ -147,7 +100,6 @@ data:
147 100
       replicas:
148 101
         mds: 1
149 102
         mgr: 1
150
-        rgw: 1
151 103
 
152 104
     conf:
153 105
       pool:

+ 0
- 46
global/software/charts/ucp/ceph/ceph-mon.yaml View File

@@ -39,56 +39,14 @@ metadata:
39 39
         path: .storage.ceph.cluster_cidr
40 40
       dest:
41 41
         path: .values.network.cluster
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: ucp_endpoints
45
-        path: .ucp.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: ucp_endpoints
51
-        path: .ceph.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-    - src:
67
-        schema: pegleg/AccountCatalogue/v1
68
-        name: ucp_service_accounts
69
-        path: .ucp.keystone.admin
70
-      dest:
71
-        path: .values.endpoints.identity.auth.admin
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: ucp_service_accounts
75
-        path: .ceph.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 48
 
79 49
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: ucp_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 50
     - dest:
93 51
        path: .values.conf.ceph.global.fsid
94 52
       src:
@@ -124,10 +82,6 @@ data:
124 82
         node_selector_key: ceph-mon
125 83
         node_selector_value: enabled
126 84
     endpoints:
127
-      identity:
128
-        namespace: openstack
129
-      object_store:
130
-        namespace: ceph
131 85
       ceph_mon:
132 86
         namespace: ceph
133 87
     deployment:

+ 0
- 46
global/software/charts/ucp/ceph/ceph-osd.yaml View File

@@ -39,56 +39,14 @@ metadata:
39 39
         path: .storage.ceph.cluster_cidr
40 40
       dest:
41 41
         path: .values.network.cluster
42
-    - src:
43
-        schema: pegleg/EndpointCatalogue/v1
44
-        name: ucp_endpoints
45
-        path: .ucp.identity
46
-      dest:
47
-        path: .values.endpoints.identity
48
-    - src:
49
-        schema: pegleg/EndpointCatalogue/v1
50
-        name: ucp_endpoints
51
-        path: .ceph.object_store
52
-      dest:
53
-        path: .values.endpoints.object_store
54 42
     - src:
55 43
         schema: pegleg/EndpointCatalogue/v1
56 44
         name: ucp_endpoints
57 45
         path: .ceph.ceph_mon
58 46
       dest:
59 47
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66
-    - src:
67
-        schema: pegleg/AccountCatalogue/v1
68
-        name: ucp_service_accounts
69
-        path: .ucp.keystone.admin
70
-      dest:
71
-        path: .values.endpoints.identity.auth.admin
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: ucp_service_accounts
75
-        path: .ceph.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 48
 
79 49
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: ucp_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 50
     - dest:
93 51
        path: .values.conf.ceph.global.fsid
94 52
       src:
@@ -116,10 +74,6 @@ data:
116 74
         node_selector_key: ceph-osd
117 75
         node_selector_value: enabled
118 76
     endpoints:
119
-      identity:
120
-        namespace: openstack
121
-      object_store:
122
-        namespace: ceph
123 77
       ceph_mon:
124 78
         namespace: ceph
125 79
     bootstrap:

+ 0
- 47
global/software/charts/ucp/ceph/ceph-provisioners.yaml View File

@@ -38,57 +38,14 @@ metadata:
38 38
         path: .storage.ceph.cluster_cidr
39 39
       dest:
40 40
         path: .values.network.cluster
41
-    - src:
42
-        schema: pegleg/EndpointCatalogue/v1
43
-        name: osh_endpoints
44
-        path: .osh.identity
45
-      dest:
46
-        path: .values.endpoints.identity
47
-    - src:
48
-        schema: pegleg/EndpointCatalogue/v1
49
-        name: ucp_endpoints
50
-        path: .ceph.object_store
51
-      dest:
52
-        path: .values.endpoints.object_store
53 41
     - src:
54 42
         schema: pegleg/EndpointCatalogue/v1
55 43
         name: ucp_endpoints
56 44
         path: .ceph.ceph_mon
57 45
       dest:
58 46
         path: .values.endpoints.ceph_mon
59
-    - src:
60
-        schema: pegleg/EndpointCatalogue/v1
61
-        name: ucp_endpoints
62
-        path: .ceph.ceph_mgr
63
-      dest:
64
-        path: .values.endpoints.ceph_mgr
65
-    - src:
66
-        schema: pegleg/AccountCatalogue/v1
67
-        name: osh_service_accounts
68
-        path: .osh.keystone.admin
69
-      dest:
70
-        path: .values.endpoints.identity.auth.admin
71
-
72
-    - src:
73
-        schema: pegleg/AccountCatalogue/v1
74
-        name: osh_service_accounts
75
-        path: .osh.swift.keystone
76
-      dest:
77
-        path: .values.endpoints.identity.auth.swift
78 47
 
79 48
     # Secrets
80
-    - dest:
81
-        path: .values.endpoints.identity.auth.admin.password
82
-      src:
83
-        schema: deckhand/Passphrase/v1
84
-        name: osh_keystone_admin_password
85
-        path: .
86
-    - dest:
87
-        path: .values.endpoints.identity.auth.swift.password
88
-      src:
89
-        schema: deckhand/Passphrase/v1
90
-        name: ceph_swift_keystone_password
91
-        path: .
92 49
     - dest:
93 50
        path: .values.conf.ceph.global.fsid
94 51
       src:
@@ -124,10 +81,6 @@ data:
124 81
         node_selector_key: ucp-control-plane
125 82
         node_selector_value: enabled
126 83
     endpoints:
127
-      identity:
128
-        namespace: openstack
129
-      object_store:
130
-        namespace: ceph
131 84
       ceph_mon:
132 85
         namespace: ceph
133 86
     deployment:

+ 0
- 6
global/software/charts/ucp/ceph/ceph-rgw.yaml View File

@@ -57,12 +57,6 @@ metadata:
57 57
         path: .ceph.ceph_mon
58 58
       dest:
59 59
         path: .values.endpoints.ceph_mon
60
-    - src:
61
-        schema: pegleg/EndpointCatalogue/v1
62
-        name: ucp_endpoints
63
-        path: .ceph.ceph_mgr
64
-      dest:
65
-        path: .values.endpoints.ceph_mgr
66 60
 
67 61
     # Credentials
68 62
     - src:

Loading…
Cancel
Save