Browse Source

Uplift Airship charts to latest working

Notable changes
 - Ceph client split in provisioner and rgw charts
 - Fixes in endpoints/osh-infra
 - Multiple charts moved from openstack-helm to openstack-helm-infra
 - Hold back MaaS/Drydock helm-toolkit - fixes in charts needed

Change-Id: I790865a4e1ec973b8182d66acad681b99414187c
changes/53/601653/23
Kaspars Skels 3 years ago
parent
commit
25cedb0d8a
  1. 57
      global/v4.0/schemas/pegleg/SoftwareVersions/v1.yaml
  2. 8
      global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
  3. 8
      global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml
  4. 4
      global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml
  5. 4
      global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml
  6. 4
      global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml
  7. 22
      global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml
  8. 6
      global/v4.0/software/charts/osh/openstack-glance/glance.yaml
  9. 4
      global/v4.0/software/charts/osh/openstack-heat/heat.yaml
  10. 4
      global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml
  11. 6
      global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml
  12. 9
      global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml
  13. 10
      global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml
  14. 9
      global/v4.0/software/charts/ucp/ceph/ceph-client.yaml
  15. 155
      global/v4.0/software/charts/ucp/ceph/ceph-provisioners.yaml
  16. 148
      global/v4.0/software/charts/ucp/ceph/ceph-rgw.yaml
  17. 2
      global/v4.0/software/charts/ucp/ceph/chart-group-update.yaml
  18. 2
      global/v4.0/software/charts/ucp/ceph/chart-group.yaml
  19. 4
      global/v4.0/software/charts/ucp/deckhand/barbican.yaml
  20. 4
      global/v4.0/software/charts/ucp/keystone/keystone.yaml
  21. 1261
      global/v4.0/software/config/versions.yaml
  22. 10
      site/airship-seaworthy/software/config/endpoints.yaml

57
global/v4.0/schemas/pegleg/SoftwareVersions/v1.yaml

@ -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:
@ -953,6 +975,41 @@ data:
type: string
image_repo_sync:
type: string
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
type: string
image_repo_sync:
type: string
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:

8
global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml

@ -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
...

8
global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml

@ -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
...

4
global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml

@ -223,7 +223,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -232,7 +232,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_cinder:
level: INFO
handlers:

4
global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml

@ -247,7 +247,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -256,7 +256,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_neutron:
level: INFO
handlers:

4
global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml

@ -339,7 +339,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -348,7 +348,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_nova:
level: INFO
handlers:

22
global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml

@ -25,13 +25,14 @@ metadata:
dest:
path: .values.images.tags
# External Interface
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .openvswitch.external_iface
dest:
path: .values.network.interface.external
pattern: 'EXTERNAL_INTERFACE'
# kskels fixme: Fix proper override for external bridge
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .openvswitch.external_iface
# dest:
# path: .values.network.interface.external
# pattern: 'EXTERNAL_INTERFACE'
data:
chart_name: openvswitch
release: openvswitch
@ -55,8 +56,9 @@ data:
node_selector_key: openvswitch
node_selector_value: enabled
network:
external_bridge: br-bond0
interface:
external: 'EXTERNAL_INTERFACE'
auto_bridge_add:
# kskels fixme: set external bridge properly
br-bond0: bond0
dependencies:
- osh-helm-toolkit
...

6
global/v4.0/software/charts/osh/openstack-glance/glance.yaml

@ -220,8 +220,6 @@ data:
registry:
node_selector_key: openstack-control-plane
node_selector_value: enabled
manifests:
job_bootstrap: false
conf:
logging:
loggers:
@ -232,7 +230,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -241,7 +239,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_glance:
level: INFO
handlers:

4
global/v4.0/software/charts/osh/openstack-heat/heat.yaml

@ -233,7 +233,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -242,7 +242,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_heat:
level: INFO
handlers:

4
global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml

@ -178,7 +178,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -187,7 +187,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_keystone:
level: INFO
handlers:

6
global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml

@ -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
...

9
global/v4.0/software/charts/ucp/ceph-config/ceph-config.yaml

@ -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
...

10
global/v4.0/software/charts/ucp/ceph/ceph-client-update.yaml

@ -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)

9
global/v4.0/software/charts/ucp/ceph/ceph-client.yaml

@ -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)

155
global/v4.0/software/charts/ucp/ceph/ceph-provisioners.yaml

@ -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
...

148
global/v4.0/software/charts/ucp/ceph/ceph-rgw.yaml

@ -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
...

2
global/v4.0/software/charts/ucp/ceph/chart-group-update.yaml

@ -15,4 +15,6 @@ data:
- ucp-ceph-mon
- ucp-ceph-osd
- ucp-ceph-client-update
- ucp-ceph-provisioners
- ucp-ceph-rgw
...

2
global/v4.0/software/charts/ucp/ceph/chart-group.yaml

@ -15,4 +15,6 @@ data:
- ucp-ceph-mon
- ucp-ceph-osd
- ucp-ceph-client
- ucp-ceph-provisioners
- ucp-ceph-rgw
...

4
global/v4.0/software/charts/ucp/deckhand/barbican.yaml

@ -161,7 +161,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -170,7 +170,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_barbican:
level: INFO
handlers:

4
global/v4.0/software/charts/ucp/keystone/keystone.yaml

@ -144,7 +144,7 @@ data:
keys:
- stdout
- stderr
- "null"
- 'null'
- fluent
formatters:
keys:
@ -153,7 +153,7 @@ data:
- fluent
logger_root:
level: WARNING
handlers: null
handlers: 'null'
logger_keystone:
level: INFO
handlers:

1261
global/v4.0/software/config/versions.yaml

File diff suppressed because it is too large

10
site/airship-seaworthy/software/config/endpoints.yaml

@ -118,7 +118,8 @@ data:
admin:
default: 35357
api:
default: 80
default: 5000
# public: 443
public: 80
armada:
name: armada
@ -204,7 +205,7 @@ data:
default: rabbitmq
host_fqdn_override:
default: null
path: /openstack
path: /keystone
scheme: rabbit
port:
amqp:
@ -755,6 +756,8 @@ data:
hosts:
default: keystone-api
public: keystone
admin: keystone-api
internal: keystone-api
host_fqdn_override:
default: null
public:
@ -768,8 +771,9 @@ data:
admin:
default: 35357
api:
default: 80
default: 5000
# public: 443
public: 80
glance_oslo_messaging:
namespace: openstack
hosts:

Loading…
Cancel
Save