airship
/
treasuremap
Code Issues Proposed changes

Integrate ceph utility container in airship/treasuremap 

Ceph utility container will be used to perform
operations team to perform operation on the ceph
cluster

Change-Id: Ib85c5a629bc892eda38a25278a53f50cf44cba47
This commit is contained in:
Rahul Khiyani 2019-09-09 17:31:03 -05:00 committed by KHIYANI, RAHUL (rk0850)
parent bf280b624b
commit 2f5d5d8894
5 changed files with 303 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
global/schemas/pegleg/SoftwareVersions/v1.yaml
View File

@ -585,83 +585,57 @@ data:
tenant-ceph-mon:
type: object
properties:
fluentbit:
type:
type: string
ceph_bootstrap:
location:
type: string
dep_check:
subpath:
type: string
ceph_mon:
type: string
ceph_config_helper:
type: string
ceph_mon_check:
type: string
image_repo_sync:
reference:
type: string
tenant-ceph-osd:
type: object
properties:
fluentbit:
type:
type: string
ceph_bootstrap:
location:
type: string
dep_check:
subpath:
type: string
ceph_osd:
type: string
image_repo_sync:
reference:
type: string
tenant-ceph-client:
type: object
properties:
ceph_bootstrap:
type:
type: string
dep_check:
location:
type: string
ceph_mds:
subpath:
type: string
ceph_mgr:
type: string
ceph_config_helper:
type: string
ceph_rbd_pool:
type: string
image_repo_sync:
reference:
type: string
tenant-ceph-provisioners:
type: object
properties:
ceph_bootstrap:
type:
type: string
ceph_cephfs_provisioner:
location:
type: string
ceph_config_helper:
subpath:
type: string
ceph_rbd_provisioner:
type: string
dep_check:
type: string
image_repo_sync:
reference:
type: string
tenant-ceph-rgw:
type: object
properties:
ceph_config_helper:
type:
type: string
ceph_rgw:
location:
type: string
dep_check:
subpath:
type: string
image_repo_sync:
type: string
rgw_s3_admin:
type: string
ks_endpoints:
type: string
ks_service:
type: string
ks_user:
reference:
type: string
deckhand:
type: object
@ -815,12 +789,23 @@ data:
properties:
type:
type: string
location:
type: string
subpath:
type: string
reference:
type: string
location:
type: string
subpath:
type: string
reference:
type: string
ceph-utility:
type: object
properties:
type:
type: string
location:
type: string
subpath:
type: string
reference:
type: string
files:
type: object
properties:
@ -1029,6 +1014,13 @@ data:
type: string
image_repo_sync:
type: string
ceph-utility:
type: object
properties:
ceph_utility:
type: string
image_repo_sync:
type: string
ceph:
type: object
properties:
@ -1125,6 +1117,87 @@ data:
type: string
ks_user:
type: string
tenant-ceph-mon:
type: object
properties:
fluentbit:
type: string
ceph_bootstrap:
type: string
dep_check:
type: string
ceph_mon:
type: string
ceph_config_helper:
type: string
ceph_mon_check:
type: string
image_repo_sync:
type: string
tenant-ceph-osd:
type: object
properties:
fluentbit:
type: string
ceph_bootstrap:
type: string
dep_check:
type: string
ceph_osd:
type: string
image_repo_sync:
type: string
tenant-ceph-client:
type: object
properties:
ceph_bootstrap:
type: string
dep_check:
type: string
ceph_mds:
type: string
ceph_mgr:
type: string
ceph_config_helper:
type: string
ceph_rbd_pool:
type: string
image_repo_sync:
type: string
tenant-ceph-provisioners:
type: object
properties:
ceph_bootstrap:
type: string
ceph_cephfs_provisioner:
type: string
ceph_config_helper:
type: string
ceph_rbd_provisioner:
type: string
dep_check:
type: string
image_repo_sync:
type: string
tenant-ceph-rgw:
type: object
properties:
ceph_config_helper:
type: string
ceph_rgw:
type: string
dep_check:
type: string
image_repo_sync:
type: string
rgw_s3_admin:
type: string
ks_endpoints:
type: string
ks_service:
type: string
ks_user:
type: string
kubernetes:
type: object
properties:

92
global/software/charts/utilities/ceph-utility-config.yaml Normal file
View File

@ -0,0 +1,92 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ceph-utility-config
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
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
# Endpoints
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ceph.ceph_mon
dest:
path: .values.endpoints.ceph_mon
data:
chart_name: ceph-utility-config
release: ceph-utility-config
namespace: utility
protected:
continue_processing: true
wait:
timeout: 3600
labels:
release_group: airship-ceph-utility-config
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: airship-ceph-utility-config
values:
labels:
job:
node_selector_key: utility
node_selector_value: enabled
provisioner:
node_selector_key: utility
node_selector_value: enabled
deployment:
ceph: false
client_secrets: true
rbd_provisioner: false
cephfs_provisioner: false
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
storageclass:
rbd:
ceph_configmap_name: ceph-etc
user_secret_name: pvc-ceph-client-key
dependencies:
- ceph-htk
...

71
global/software/charts/utilities/ceph-utility.yaml Normal file
View File

@ -0,0 +1,71 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ceph-utility
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
# Chart source
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.utility.ceph-utility
dest:
path: .source
# Images
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .images.utility.ceph-utility
dest:
path: .values.images.tags
data:
chart_name: ceph-utility
release: ceph-utility
namespace: utility
protected:
continue_processing: true
wait:
timeout: 600
labels:
release_group: airship-ceph-utility
install:
no_hooks: false
upgrade:
no_hooks: false
values:
labels:
utility:
node_selector_key: utility
node_selector_value: enabled
dependencies:
- ceph-utility-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ceph-utility-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.utility.ceph-utility-htk
dest:
path: .source
data:
chart_name: ceph-utility-htk
release: ceph-utility-htk
namespace: ceph-utility-htk
values: {}
dependencies: []
...

2
global/software/charts/utilities/chart-group.yaml
View File

@ -12,3 +12,5 @@ data:
sequenced: false
chart_group:
- calicoctl-utility
# - ceph-utility-config
# - ceph-utility

13
global/software/config/versions.yaml
View File

@ -552,6 +552,16 @@ data:
reference: ef58054dff356334cdbfd96f04dc7c149768c76d
subpath: helm-toolkit
type: git
ceph-utility:
location: https://opendev.org/airship/porthole
reference: cb5d6cfba3541b48cdc1a494cd04cc8ac3fd86c8
subpath: charts/ceph-utility
type: git
ceph-utility-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: ef58054dff356334cdbfd96f04dc7c149768c76d
subpath: helm-toolkit
type: git
images:
calico:
calico:
@ -1038,6 +1048,9 @@ data:
calicoctl-utility:
calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-alpine
image_repo_sync: docker.io/docker:18.09.02
ceph-utility:
ceph_utility: quay.io/airshipit/porthole-ceph-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial
image_repo_sync: docker.io/docker:18.09.02
packages:
gpgkey: |-
-----BEGIN PGP PUBLIC KEY BLOCK-----