summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChinasubbareddy M <cr3938@att.com>2019-01-08 13:55:07 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-01-14 19:29:13 +0000
commitf96c3016a06c39c028a3e290f769ba001d44a8a3 (patch)
tree2f596c345cb06f24c4560a7edd8b589182eb0db6
parent6e7dc091a10ccae2d8c9a384507c73f2f1e71c19 (diff)
Airship-treasuremap: Ceph charts cleanup
This is to clean ceph charts for unused variables and left over from ceph chart split Change-Id: I3155c9079ab4b0b4df30782335833389c452adfd
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Craig Anderson <craig.anderson@att.com> Code-Review+1: Matthew Heler <matthew.heler@hotmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 14 Jan 2019 22:32:21 +0000 Reviewed-on: https://review.openstack.org/629302 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml57
-rw-r--r--global/software/charts/osh/openstack-ceph-config/ceph-config.yaml58
-rw-r--r--global/software/charts/osh/openstack-radosgw/radosgw.yaml6
-rw-r--r--global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml46
-rw-r--r--global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml55
-rw-r--r--global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml46
-rw-r--r--global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml46
-rw-r--r--global/software/charts/ucp/ceph-config/ceph-config.yaml54
-rw-r--r--global/software/charts/ucp/ceph/ceph-client-update.yaml52
-rw-r--r--global/software/charts/ucp/ceph/ceph-client.yaml48
-rw-r--r--global/software/charts/ucp/ceph/ceph-mon.yaml46
-rw-r--r--global/software/charts/ucp/ceph/ceph-osd.yaml46
-rw-r--r--global/software/charts/ucp/ceph/ceph-provisioners.yaml47
-rw-r--r--global/software/charts/ucp/ceph/ceph-rgw.yaml6
14 files changed, 0 insertions, 613 deletions
diff --git a/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml b/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
index de57639..0049423 100644
--- a/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
+++ b/global/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
@@ -41,56 +41,11 @@ metadata:
41 # Endpoints 41 # Endpoints
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints 44 name: ucp_endpoints
57 path: .ceph.ceph_mon 45 path: .ceph.ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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
95data: 50data:
96 chart_name: osh-infra-ceph-config 51 chart_name: osh-infra-ceph-config
@@ -117,15 +72,6 @@ data:
117 provisioner: 72 provisioner:
118 node_selector_key: openstack-control-plane 73 node_selector_key: openstack-control-plane
119 node_selector_value: enabled 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 deployment: 75 deployment:
130 ceph: false 76 ceph: false
131 client_secrets: true 77 client_secrets: true
@@ -134,9 +80,6 @@ data:
134 rgw_keystone_user_and_endpoints: false 80 rgw_keystone_user_and_endpoints: false
135 bootstrap: 81 bootstrap:
136 enabled: false 82 enabled: false
137 conf:
138 rgw_ks:
139 enabled: true
140 storageclass: 83 storageclass:
141 rbd: 84 rbd:
142 ceph_configmap_name: ceph-etc 85 ceph_configmap_name: ceph-etc
diff --git a/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
index 9467af4..58294ec 100644
--- a/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
+++ b/global/software/charts/osh/openstack-ceph-config/ceph-config.yaml
@@ -41,56 +41,10 @@ metadata:
41 # Endpoints 41 # Endpoints
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints 44 name: ucp_endpoints
57 path: .ceph.ceph_mon 45 path: .ceph.ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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
95data: 49data:
96 chart_name: openstack-ceph-config 50 chart_name: openstack-ceph-config
@@ -117,15 +71,6 @@ data:
117 provisioner: 71 provisioner:
118 node_selector_key: openstack-control-plane 72 node_selector_key: openstack-control-plane
119 node_selector_value: enabled 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 deployment: 74 deployment:
130 ceph: false 75 ceph: false
131 client_secrets: true 76 client_secrets: true
@@ -134,9 +79,6 @@ data:
134 rgw_keystone_user_and_endpoints: false 79 rgw_keystone_user_and_endpoints: false
135 bootstrap: 80 bootstrap:
136 enabled: false 81 enabled: false
137 conf:
138 rgw_ks:
139 enabled: true
140 storageclass: 82 storageclass:
141 rbd: 83 rbd:
142 ceph_configmap_name: ceph-etc 84 ceph_configmap_name: ceph-etc
diff --git a/global/software/charts/osh/openstack-radosgw/radosgw.yaml b/global/software/charts/osh/openstack-radosgw/radosgw.yaml
index d91cb81..74ff799 100644
--- a/global/software/charts/osh/openstack-radosgw/radosgw.yaml
+++ b/global/software/charts/osh/openstack-radosgw/radosgw.yaml
@@ -57,12 +57,6 @@ metadata:
57 path: .ceph.tenant_ceph_mon 57 path: .ceph.tenant_ceph_mon
58 dest: 58 dest:
59 path: .values.endpoints.ceph_mon 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 # Credentials 61 # Credentials
68 - src: 62 - src:
diff --git a/global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml b/global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml
index f48594c..e7eb842 100644
--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml
@@ -40,18 +40,6 @@ metadata:
40 path: .values.network.cluster 40 path: .values.network.cluster
41 - src: 41 - src:
42 schema: pegleg/EndpointCatalogue/v1 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 - src:
54 schema: pegleg/EndpointCatalogue/v1
55 name: ucp_endpoints 43 name: ucp_endpoints
56 path: .ceph.tenant_ceph_mon 44 path: .ceph.tenant_ceph_mon
57 dest: 45 dest:
@@ -62,33 +50,9 @@ metadata:
62 path: .ceph.tenant_ceph_mgr 50 path: .ceph.tenant_ceph_mgr
63 dest: 51 dest:
64 path: .values.endpoints.ceph_mgr 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 # Secrets 54 # Secrets
79 - dest: 55 - 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 - dest:
92 path: .values.conf.ceph.global.fsid 56 path: .values.conf.ceph.global.fsid
93 src: 57 src:
94 schema: deckhand/Passphrase/v1 58 schema: deckhand/Passphrase/v1
@@ -119,23 +83,13 @@ data:
119 job: 83 job:
120 node_selector_key: tenant-ceph-control-plane 84 node_selector_key: tenant-ceph-control-plane
121 node_selector_value: enabled 85 node_selector_value: enabled
122 provisioner:
123 node_selector_key: tenant-ceph-control-plane
124 node_selector_value: enabled
125 mds: 86 mds:
126 node_selector_key: tenant-ceph-mds 87 node_selector_key: tenant-ceph-mds
127 node_selector_value: enabled 88 node_selector_value: enabled
128 rgw:
129 node_selector_key: tenant-ceph-rgw
130 node_selector_value: enabled
131 mgr: 89 mgr:
132 node_selector_key: tenant-ceph-mgr 90 node_selector_key: tenant-ceph-mgr
133 node_selector_value: enabled 91 node_selector_value: enabled
134 endpoints: 92 endpoints:
135 identity:
136 namespace: openstack
137 object_store:
138 namespace: openstack
139 ceph_mon: 93 ceph_mon:
140 namespace: tenant-ceph 94 namespace: tenant-ceph
141 ceph_mgr: 95 ceph_mgr:
diff --git a/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml b/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
index bb25700..7599670 100644
--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
@@ -41,56 +41,10 @@ metadata:
41 # Endpoints 41 # Endpoints
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints 44 name: ucp_endpoints
57 path: .ceph.tenant_ceph_mon 45 path: .ceph.tenant_ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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
95data: 49data:
96 chart_name: tenant-ceph-config 50 chart_name: tenant-ceph-config
@@ -114,15 +68,9 @@ data:
114 job: 68 job:
115 node_selector_key: tenant-ceph-control-plane 69 node_selector_key: tenant-ceph-control-plane
116 node_selector_value: enabled 70 node_selector_value: enabled
117 provisioner:
118 node_selector_key: tenant-ceph-control-plane
119 node_selector_value: enabled
120 mds: 71 mds:
121 node_selector_key: tenant-ceph-mds 72 node_selector_key: tenant-ceph-mds
122 node_selector_value: enabled 73 node_selector_value: enabled
123 rgw:
124 node_selector_key: tenant-ceph-rgw
125 node_selector_value: enabled
126 mgr: 74 mgr:
127 node_selector_key: tenant-ceph-mgr 75 node_selector_key: tenant-ceph-mgr
128 node_selector_value: enabled 76 node_selector_value: enabled
@@ -134,9 +82,6 @@ data:
134 rgw_keystone_user_and_endpoints: false 82 rgw_keystone_user_and_endpoints: false
135 bootstrap: 83 bootstrap:
136 enabled: false 84 enabled: false
137 conf:
138 rgw_ks:
139 enabled: true
140 storageclass: 85 storageclass:
141 rbd: 86 rbd:
142 ceph_configmap_name: tenant-ceph-etc 87 ceph_configmap_name: tenant-ceph-etc
diff --git a/global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml b/global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml
index 319f3d2..b3439ec 100644
--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml
@@ -41,55 +41,13 @@ metadata:
41 path: .values.network.cluster 41 path: .values.network.cluster
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints 44 name: ucp_endpoints
57 path: .ceph.tenant_ceph_mon 45 path: .ceph.tenant_ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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 # Secrets 49 # Secrets
80 - dest: 50 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 51 path: .values.conf.ceph.global.fsid
94 src: 52 src:
95 schema: deckhand/Passphrase/v1 53 schema: deckhand/Passphrase/v1
@@ -124,10 +82,6 @@ data:
124 node_selector_key: tenant-ceph-mon 82 node_selector_key: tenant-ceph-mon
125 node_selector_value: enabled 83 node_selector_value: enabled
126 endpoints: 84 endpoints:
127 identity:
128 namespace: openstack
129 object_store:
130 namespace: openstack
131 ceph_mon: 85 ceph_mon:
132 namespace: tenant-ceph 86 namespace: tenant-ceph
133 ceph_mgr: 87 ceph_mgr:
diff --git a/global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
index 2c874a7..c72655d 100644
--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
@@ -41,55 +41,13 @@ metadata:
41 path: .values.network.cluster 41 path: .values.network.cluster
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints 44 name: ucp_endpoints
57 path: .ceph.tenant_ceph_mon 45 path: .ceph.tenant_ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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 # Secrets 49 # Secrets
80 - dest: 50 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 51 path: .values.conf.ceph.global.fsid
94 src: 52 src:
95 schema: deckhand/Passphrase/v1 53 schema: deckhand/Passphrase/v1
@@ -116,10 +74,6 @@ data:
116 node_selector_key: tenant-ceph-osd 74 node_selector_key: tenant-ceph-osd
117 node_selector_value: enabled 75 node_selector_value: enabled
118 endpoints: 76 endpoints:
119 identity:
120 namespace: openstack
121 object_store:
122 namespace: openstack
123 ceph_mon: 77 ceph_mon:
124 namespace: tenant-ceph 78 namespace: tenant-ceph
125 ceph_mgr: 79 ceph_mgr:
diff --git a/global/software/charts/ucp/ceph-config/ceph-config.yaml b/global/software/charts/ucp/ceph-config/ceph-config.yaml
index 68b8af0..19a380a 100644
--- a/global/software/charts/ucp/ceph-config/ceph-config.yaml
+++ b/global/software/charts/ucp/ceph-config/ceph-config.yaml
@@ -42,55 +42,10 @@ metadata:
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 43 schema: pegleg/EndpointCatalogue/v1
44 name: ucp_endpoints 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints
57 path: .ceph.ceph_mon 45 path: .ceph.ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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
95data: 50data:
96 chart_name: ucp-ceph-config 51 chart_name: ucp-ceph-config
@@ -117,15 +72,6 @@ data:
117 provisioner: 72 provisioner:
118 node_selector_key: ucp-control-plane 73 node_selector_key: ucp-control-plane
119 node_selector_value: enabled 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 deployment: 75 deployment:
130 ceph: false 76 ceph: false
131 client_secrets: true 77 client_secrets: true
diff --git a/global/software/charts/ucp/ceph/ceph-client-update.yaml b/global/software/charts/ucp/ceph/ceph-client-update.yaml
index ded4df0..ccefcd0 100644
--- a/global/software/charts/ucp/ceph/ceph-client-update.yaml
+++ b/global/software/charts/ucp/ceph/ceph-client-update.yaml
@@ -40,55 +40,13 @@ metadata:
40 path: .values.network.cluster 40 path: .values.network.cluster
41 - src: 41 - src:
42 schema: pegleg/EndpointCatalogue/v1 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 - src:
54 schema: pegleg/EndpointCatalogue/v1
55 name: ucp_endpoints 43 name: ucp_endpoints
56 path: .ceph.ceph_mon 44 path: .ceph.ceph_mon
57 dest: 45 dest:
58 path: .values.endpoints.ceph_mon 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 # Secrets 48 # Secrets
79 - dest: 49 - 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 - dest:
92 path: .values.conf.ceph.global.fsid 50 path: .values.conf.ceph.global.fsid
93 src: 51 src:
94 schema: deckhand/Passphrase/v1 52 schema: deckhand/Passphrase/v1
@@ -119,23 +77,13 @@ data:
119 job: 77 job:
120 node_selector_key: ucp-control-plane 78 node_selector_key: ucp-control-plane
121 node_selector_value: enabled 79 node_selector_value: enabled
122 provisioner:
123 node_selector_key: ucp-control-plane
124 node_selector_value: enabled
125 mds: 80 mds:
126 node_selector_key: ceph-mds 81 node_selector_key: ceph-mds
127 node_selector_value: enabled 82 node_selector_value: enabled
128 rgw:
129 node_selector_key: ceph-rgw
130 node_selector_value: enabled
131 mgr: 83 mgr:
132 node_selector_key: ceph-mgr 84 node_selector_key: ceph-mgr
133 node_selector_value: enabled 85 node_selector_value: enabled
134 endpoints: 86 endpoints:
135 identity:
136 namespace: openstack
137 object_store:
138 namespace: ceph
139 ceph_mon: 87 ceph_mon:
140 namespace: ceph 88 namespace: ceph
141 deployment: 89 deployment:
diff --git a/global/software/charts/ucp/ceph/ceph-client.yaml b/global/software/charts/ucp/ceph/ceph-client.yaml
index cf2e366..01e1af8 100644
--- a/global/software/charts/ucp/ceph/ceph-client.yaml
+++ b/global/software/charts/ucp/ceph/ceph-client.yaml
@@ -40,18 +40,6 @@ metadata:
40 path: .values.network.cluster 40 path: .values.network.cluster
41 - src: 41 - src:
42 schema: pegleg/EndpointCatalogue/v1 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 - src:
54 schema: pegleg/EndpointCatalogue/v1
55 name: ucp_endpoints 43 name: ucp_endpoints
56 path: .ceph.ceph_mon 44 path: .ceph.ceph_mon
57 dest: 45 dest:
@@ -62,34 +50,9 @@ metadata:
62 path: .ceph.ceph_mgr 50 path: .ceph.ceph_mgr
63 dest: 51 dest:
64 path: .values.endpoints.ceph_mgr 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 # Secrets 54 # Secrets
80 - dest: 55 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 56 path: .values.conf.ceph.global.fsid
94 src: 57 src:
95 schema: deckhand/Passphrase/v1 58 schema: deckhand/Passphrase/v1
@@ -120,23 +83,13 @@ data:
120 job: 83 job:
121 node_selector_key: ucp-control-plane 84 node_selector_key: ucp-control-plane
122 node_selector_value: enabled 85 node_selector_value: enabled
123 provisioner:
124 node_selector_key: ucp-control-plane
125 node_selector_value: enabled
126 mds: 86 mds:
127 node_selector_key: ceph-mds 87 node_selector_key: ceph-mds
128 node_selector_value: enabled 88 node_selector_value: enabled
129 rgw:
130 node_selector_key: ceph-rgw
131 node_selector_value: enabled
132 mgr: 89 mgr:
133 node_selector_key: ceph-mgr 90 node_selector_key: ceph-mgr
134 node_selector_value: enabled 91 node_selector_value: enabled
135 endpoints: 92 endpoints:
136 identity:
137 namespace: openstack
138 object_store:
139 namespace: ceph
140 ceph_mon: 93 ceph_mon:
141 namespace: ceph 94 namespace: ceph
142 deployment: 95 deployment:
@@ -147,7 +100,6 @@ data:
147 replicas: 100 replicas:
148 mds: 1 101 mds: 1
149 mgr: 1 102 mgr: 1
150 rgw: 1
151 103
152 conf: 104 conf:
153 pool: 105 pool:
diff --git a/global/software/charts/ucp/ceph/ceph-mon.yaml b/global/software/charts/ucp/ceph/ceph-mon.yaml
index 8cafe35..87eb15f 100644
--- a/global/software/charts/ucp/ceph/ceph-mon.yaml
+++ b/global/software/charts/ucp/ceph/ceph-mon.yaml
@@ -42,54 +42,12 @@ metadata:
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 43 schema: pegleg/EndpointCatalogue/v1
44 name: ucp_endpoints 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints
57 path: .ceph.ceph_mon 45 path: .ceph.ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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 # Secrets 49 # Secrets
80 - dest: 50 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 51 path: .values.conf.ceph.global.fsid
94 src: 52 src:
95 schema: deckhand/Passphrase/v1 53 schema: deckhand/Passphrase/v1
@@ -124,10 +82,6 @@ data:
124 node_selector_key: ceph-mon 82 node_selector_key: ceph-mon
125 node_selector_value: enabled 83 node_selector_value: enabled
126 endpoints: 84 endpoints:
127 identity:
128 namespace: openstack
129 object_store:
130 namespace: ceph
131 ceph_mon: 85 ceph_mon:
132 namespace: ceph 86 namespace: ceph
133 deployment: 87 deployment:
diff --git a/global/software/charts/ucp/ceph/ceph-osd.yaml b/global/software/charts/ucp/ceph/ceph-osd.yaml
index aea2672..1a350dc 100644
--- a/global/software/charts/ucp/ceph/ceph-osd.yaml
+++ b/global/software/charts/ucp/ceph/ceph-osd.yaml
@@ -42,54 +42,12 @@ metadata:
42 - src: 42 - src:
43 schema: pegleg/EndpointCatalogue/v1 43 schema: pegleg/EndpointCatalogue/v1
44 name: ucp_endpoints 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 - src:
55 schema: pegleg/EndpointCatalogue/v1
56 name: ucp_endpoints
57 path: .ceph.ceph_mon 45 path: .ceph.ceph_mon
58 dest: 46 dest:
59 path: .values.endpoints.ceph_mon 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 # Secrets 49 # Secrets
80 - dest: 50 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 51 path: .values.conf.ceph.global.fsid
94 src: 52 src:
95 schema: deckhand/Passphrase/v1 53 schema: deckhand/Passphrase/v1
@@ -116,10 +74,6 @@ data:
116 node_selector_key: ceph-osd 74 node_selector_key: ceph-osd
117 node_selector_value: enabled 75 node_selector_value: enabled
118 endpoints: 76 endpoints:
119 identity:
120 namespace: openstack
121 object_store:
122 namespace: ceph
123 ceph_mon: 77 ceph_mon:
124 namespace: ceph 78 namespace: ceph
125 bootstrap: 79 bootstrap:
diff --git a/global/software/charts/ucp/ceph/ceph-provisioners.yaml b/global/software/charts/ucp/ceph/ceph-provisioners.yaml
index 8cf9498..7600888 100644
--- a/global/software/charts/ucp/ceph/ceph-provisioners.yaml
+++ b/global/software/charts/ucp/ceph/ceph-provisioners.yaml
@@ -40,56 +40,13 @@ metadata:
40 path: .values.network.cluster 40 path: .values.network.cluster
41 - src: 41 - src:
42 schema: pegleg/EndpointCatalogue/v1 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 - src:
54 schema: pegleg/EndpointCatalogue/v1
55 name: ucp_endpoints 43 name: ucp_endpoints
56 path: .ceph.ceph_mon 44 path: .ceph.ceph_mon
57 dest: 45 dest:
58 path: .values.endpoints.ceph_mon 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 # Secrets 48 # Secrets
80 - dest: 49 - 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 - dest:
93 path: .values.conf.ceph.global.fsid 50 path: .values.conf.ceph.global.fsid
94 src: 51 src:
95 schema: deckhand/Passphrase/v1 52 schema: deckhand/Passphrase/v1
@@ -124,10 +81,6 @@ data:
124 node_selector_key: ucp-control-plane 81 node_selector_key: ucp-control-plane
125 node_selector_value: enabled 82 node_selector_value: enabled
126 endpoints: 83 endpoints:
127 identity:
128 namespace: openstack
129 object_store:
130 namespace: ceph
131 ceph_mon: 84 ceph_mon:
132 namespace: ceph 85 namespace: ceph
133 deployment: 86 deployment:
diff --git a/global/software/charts/ucp/ceph/ceph-rgw.yaml b/global/software/charts/ucp/ceph/ceph-rgw.yaml
index b6169ae..7dd30ca 100644
--- a/global/software/charts/ucp/ceph/ceph-rgw.yaml
+++ b/global/software/charts/ucp/ceph/ceph-rgw.yaml
@@ -57,12 +57,6 @@ metadata:
57 path: .ceph.ceph_mon 57 path: .ceph.ceph_mon
58 dest: 58 dest:
59 path: .values.endpoints.ceph_mon 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 # Credentials 61 # Credentials
68 - src: 62 - src: