Uplift latest Airship charts
Notable changes - Ceph client chart split in provisioner and rgw charts Change-Id: I790865a4e1ec973b8182d66acad681b99414187c
This commit is contained in:
parent
2170af6109
commit
f880d287b5
|
@ -549,6 +549,28 @@ data:
|
|||
type: string
|
||||
reference:
|
||||
type: string
|
||||
ceph-provisioners:
|
||||
type: object
|
||||
properties:
|
||||
type:
|
||||
type: string
|
||||
location:
|
||||
type: string
|
||||
subpath:
|
||||
type: string
|
||||
reference:
|
||||
type: string
|
||||
ceph-rgw:
|
||||
type: object
|
||||
properties:
|
||||
type:
|
||||
type: string
|
||||
location:
|
||||
type: string
|
||||
subpath:
|
||||
type: string
|
||||
reference:
|
||||
type: string
|
||||
deckhand:
|
||||
type: object
|
||||
properties:
|
||||
|
|
|
@ -12,7 +12,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-client
|
||||
path: .charts.ucp.ceph-provisioners
|
||||
dest:
|
||||
path: .source
|
||||
|
||||
|
@ -20,7 +20,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-client
|
||||
path: .images.ceph.ceph-provisioners
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
|
@ -137,6 +137,10 @@ data:
|
|||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
storageclass:
|
||||
rbd:
|
||||
ceph_configmap_name: ceph-etc
|
||||
user_secret_name: pvc-ceph-client-key
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
||||
|
|
|
@ -12,7 +12,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-client
|
||||
path: .charts.ucp.ceph-provisioners
|
||||
dest:
|
||||
path: .source
|
||||
|
||||
|
@ -20,7 +20,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-client
|
||||
path: .images.ceph.ceph-provisioners
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
|
@ -137,6 +137,10 @@ data:
|
|||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
storageclass:
|
||||
rbd:
|
||||
ceph_configmap_name: ceph-etc
|
||||
user_secret_name: pvc-ceph-client-key
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
||||
|
|
|
@ -12,7 +12,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-client
|
||||
path: .charts.ucp.ceph-rgw
|
||||
dest:
|
||||
path: .source
|
||||
|
||||
|
@ -20,7 +20,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-client
|
||||
path: .images.ceph.ceph-rgw
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
|
@ -137,6 +137,8 @@ data:
|
|||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
ceph_client:
|
||||
configmap: ceph-etc
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
||||
|
|
|
@ -12,7 +12,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-client
|
||||
path: .charts.ucp.ceph-provisioners
|
||||
dest:
|
||||
path: .source
|
||||
|
||||
|
@ -20,7 +20,7 @@ metadata:
|
|||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-client
|
||||
path: .images.ceph.ceph-provisioners
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
|
@ -137,7 +137,10 @@ data:
|
|||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
|
||||
storageclass:
|
||||
rbd:
|
||||
ceph_configmap_name: ceph-etc
|
||||
user_secret_name: pvc-ceph-client-key
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
||||
|
|
|
@ -140,24 +140,14 @@ data:
|
|||
namespace: ceph
|
||||
deployment:
|
||||
ceph: true
|
||||
client_secrets: false
|
||||
rbd_provisioner: true
|
||||
cephfs_provisioner: true
|
||||
rgw_keystone_user_and_endpoints: false
|
||||
bootstrap:
|
||||
enabled: true
|
||||
pod:
|
||||
replicas:
|
||||
mds: 2
|
||||
mgr: 2
|
||||
rgw: 2
|
||||
|
||||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
config:
|
||||
#NOTE (portdirect): See http://tracker.ceph.com/issues/21226
|
||||
rgw_keystone_token_cache_size: '0'
|
||||
pool:
|
||||
|
||||
# NOTE(alanmeadows) spport 4.x 16.04 kernels (non-HWE)
|
||||
|
|
|
@ -141,10 +141,6 @@ data:
|
|||
namespace: ceph
|
||||
deployment:
|
||||
ceph: true
|
||||
client_secrets: false
|
||||
rbd_provisioner: true
|
||||
cephfs_provisioner: true
|
||||
rgw_keystone_user_and_endpoints: false
|
||||
bootstrap:
|
||||
enabled: true
|
||||
pod:
|
||||
|
@ -154,11 +150,6 @@ data:
|
|||
rgw: 1
|
||||
|
||||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
config:
|
||||
#NOTE (portdirect): See http://tracker.ceph.com/issues/21226
|
||||
rgw_keystone_token_cache_size: '0'
|
||||
pool:
|
||||
|
||||
# NOTE(alanmeadows) spport 4.x 16.04 kernels (non-HWE)
|
||||
|
|
|
@ -0,0 +1,155 @@
|
|||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: ucp-ceph-provisioners
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: global
|
||||
storagePolicy: cleartext
|
||||
labels:
|
||||
name: ucp-ceph-provisioners
|
||||
substitutions:
|
||||
# Chart source
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-provisioners
|
||||
dest:
|
||||
path: .source
|
||||
# Images
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-provisioners
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
# IP addresses
|
||||
- src:
|
||||
schema: pegleg/CommonAddresses/v1
|
||||
name: common-addresses
|
||||
path: .storage.ceph.public_cidr
|
||||
dest:
|
||||
path: .values.network.public
|
||||
- src:
|
||||
schema: pegleg/CommonAddresses/v1
|
||||
name: common-addresses
|
||||
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:
|
||||
schema: deckhand/Passphrase/v1
|
||||
name: ceph_fsid
|
||||
path: .
|
||||
|
||||
data:
|
||||
chart_name: ucp-ceph-provisioners
|
||||
release: ucp-ceph-provisioners
|
||||
namespace: ceph
|
||||
protected:
|
||||
continue_processing: true
|
||||
wait:
|
||||
timeout: 900
|
||||
labels:
|
||||
release_group: airship-ucp-ceph-provisioners
|
||||
install:
|
||||
no_hooks: false
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
pre:
|
||||
delete:
|
||||
- type: job
|
||||
labels:
|
||||
release_group: airship-ucp-ceph-provisioners
|
||||
values:
|
||||
labels:
|
||||
job:
|
||||
node_selector_key: ucp-control-plane
|
||||
node_selector_value: enabled
|
||||
provisioner:
|
||||
node_selector_key: ucp-control-plane
|
||||
node_selector_value: enabled
|
||||
endpoints:
|
||||
identity:
|
||||
namespace: openstack
|
||||
object_store:
|
||||
namespace: ceph
|
||||
ceph_mon:
|
||||
namespace: ceph
|
||||
deployment:
|
||||
ceph: true
|
||||
client_secrets: true
|
||||
rbd_provisioner: true
|
||||
cephfs_provisioner: true
|
||||
bootstrap:
|
||||
enabled: true
|
||||
pod:
|
||||
replicas:
|
||||
cephfs_provisioner: 2
|
||||
rbd_provisioner: 2
|
||||
|
||||
conf:
|
||||
ceph:
|
||||
global:
|
||||
osd_mkfs_type: xfs
|
||||
storageclass:
|
||||
rbd:
|
||||
ceph_configmap_name: ceph-client-keys-etc
|
||||
user_secret_name: pvc-ceph-client-key
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
|
@ -0,0 +1,148 @@
|
|||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: ucp-ceph-rgw
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: global
|
||||
storagePolicy: cleartext
|
||||
substitutions:
|
||||
# Chart source
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.ucp.ceph-rgw
|
||||
dest:
|
||||
path: .source
|
||||
|
||||
# Images
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .images.ceph.ceph-rgw
|
||||
dest:
|
||||
path: .values.images.tags
|
||||
|
||||
# IP addresses
|
||||
- src:
|
||||
schema: pegleg/CommonAddresses/v1
|
||||
name: common-addresses
|
||||
path: .storage.ceph.public_cidr
|
||||
dest:
|
||||
path: .values.network.public
|
||||
- src:
|
||||
schema: pegleg/CommonAddresses/v1
|
||||
name: common-addresses
|
||||
path: .storage.ceph.cluster_cidr
|
||||
dest:
|
||||
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: 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: 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: ucp-ceph-rgw
|
||||
release: ucp-ceph-rgw
|
||||
namespace: ceph
|
||||
wait:
|
||||
timeout: 900
|
||||
labels:
|
||||
release_group: airship-ucp-ceph-rgw
|
||||
install:
|
||||
no_hooks: false
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
pre:
|
||||
delete:
|
||||
- type: job
|
||||
labels:
|
||||
release_group: airship-ucp-ceph-rgw
|
||||
values:
|
||||
labels:
|
||||
job:
|
||||
node_selector_key: ucp-control-plane
|
||||
node_selector_value: enabled
|
||||
rgw:
|
||||
node_selector_key: ceph-rgw
|
||||
node_selector_value: enabled
|
||||
endpoints:
|
||||
identity:
|
||||
namespace: openstack
|
||||
object_store:
|
||||
namespace: ceph
|
||||
ceph_mon:
|
||||
namespace: ceph
|
||||
deployment:
|
||||
ceph: true
|
||||
client_secrets: false
|
||||
rbd_provisioner: false
|
||||
cephfs_provisioner: false
|
||||
rgw_keystone_user_and_endpoints: false
|
||||
bootstrap:
|
||||
enabled: false
|
||||
pod:
|
||||
replicas:
|
||||
rgw: 2
|
||||
conf:
|
||||
rgw_ks:
|
||||
enabled: true
|
||||
config:
|
||||
#NOTE (portdirect): See http://tracker.ceph.com/issues/21226
|
||||
rgw_keystone_token_cache_size: '0'
|
||||
ceph_client:
|
||||
configmap: ceph-client-keys-etc
|
||||
dependencies:
|
||||
- ceph-htk
|
||||
...
|
|
@ -15,4 +15,6 @@ data:
|
|||
- ucp-ceph-mon
|
||||
- ucp-ceph-osd
|
||||
- ucp-ceph-client-update
|
||||
- ucp-ceph-provisioners
|
||||
- ucp-ceph-rgw
|
||||
...
|
||||
|
|
|
@ -15,4 +15,6 @@ data:
|
|||
- ucp-ceph-mon
|
||||
- ucp-ceph-osd
|
||||
- ucp-ceph-client
|
||||
- ucp-ceph-provisioners
|
||||
- ucp-ceph-rgw
|
||||
...
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -770,6 +770,8 @@ data:
|
|||
api:
|
||||
default: 80
|
||||
# public: 443
|
||||
# this is for ceph-rgw chart
|
||||
internal: 80
|
||||
glance_oslo_messaging:
|
||||
namespace: openstack
|
||||
hosts:
|
||||
|
|
Loading…
Reference in New Issue