Armada manifest updates for OSH

This updates the armada multinode manifest to include the new
format for waiting on releases to complete. This is now configured
to wait for a release to complete by checking resources with the
release_group label for a given chart.

This also adds the LDAP chart, which is required for the LMA
services

Change-Id: Ie23073a04dc4c55291c0314beb0d8d215005d353
This commit is contained in:
Marshall Margenau 2018-05-14 16:09:57 -05:00 committed by Steve Wilkerson
parent 4cac07d788
commit 899384b805
4 changed files with 315 additions and 181 deletions

View File

@ -7,7 +7,6 @@ data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 300
values: {}
source:
type: local
@ -24,11 +23,14 @@ data:
chart_name: ceph-mon
release: ceph-mon
namespace: ceph
wait:
timeout: 1800
labels:
release_group: osh-ceph-mon
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -75,14 +77,14 @@ data:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: true
ceph: true
rbd_provisioner: true
cephfs_provisioner: true
client_secrets: false
rgw_keystone_user_and_endpoints: false
storage_secrets: True
ceph: True
rbd_provisioner: True
cephfs_provisioner: True
client_secrets: False
rgw_keystone_user_and_endpoints: False
bootstrap:
enabled: true
enabled: True
conf:
ceph:
global:
@ -90,7 +92,7 @@ data:
# be consistent if you wish to redploy whist maintaining data.
fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
rgw_ks:
enabled: true
enabled: True
pool:
crush:
#NOTE(portdirect): set to hammer if using kernel < 4.5
@ -123,11 +125,14 @@ data:
chart_name: ceph-osd
release: ceph-osd
namespace: ceph
wait:
timeout: 1800
labels:
release_group: osh-ceph-osd
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
identity:
@ -140,14 +145,14 @@ data:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: true
ceph: true
rbd_provisioner: true
cephfs_provisioner: true
client_secrets: false
rgw_keystone_user_and_endpoints: false
storage_secrets: True
ceph: True
rbd_provisioner: True
cephfs_provisioner: True
client_secrets: False
rgw_keystone_user_and_endpoints: False
bootstrap:
enabled: true
enabled: True
conf:
ceph:
global:
@ -155,7 +160,7 @@ data:
# be consistent if you wish to redploy whist maintaining data.
fsid: C1150D08-707D-4FEB-85E7-692BD9206DC3
rgw_ks:
enabled: true
enabled: True
pool:
crush:
#NOTE(portdirect): set to hammer if using kernel < 4.5
@ -188,11 +193,14 @@ data:
chart_name: ceph-client
release: ceph-client
namespace: ceph
wait:
timeout: 1800
labels:
release_group: osh-ceph-client
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -219,17 +227,17 @@ data:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: true
ceph: true
rbd_provisioner: true
cephfs_provisioner: true
client_secrets: false
rgw_keystone_user_and_endpoints: false
storage_secrets: True
ceph: True
rbd_provisioner: True
cephfs_provisioner: True
client_secrets: False
rgw_keystone_user_and_endpoints: False
bootstrap:
enabled: true
enabled: True
conf:
rgw_ks:
enabled: true
enabled: True
pool:
crush:
#NOTE(portdirect): set to hammer if using kernel < 4.5

View File

@ -7,7 +7,6 @@ data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 300
values: {}
source:
type: local
@ -24,11 +23,14 @@ data:
chart_name: ingress-kube-system
release: ingress-kube-system
namespace: kube-system
wait:
timeout: 1800
labels:
release_group: osh-ingress-kube-system
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
server:
@ -45,10 +47,6 @@ data:
type: DaemonSet
network:
host_namespace: true
conf:
services:
udp:
53: 'kube-system/kube-dns:53'
source:
type: local
location: ${OSH_PATH}

View File

@ -7,7 +7,6 @@ data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 300
values: {}
source:
type: local
@ -24,11 +23,14 @@ data:
chart_name: osh-infra-ingress-controller
release: osh-infra-ingress-controller
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-osh-infra-ingress-controller
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
node_selector_key: openstack-control-plane
@ -53,11 +55,14 @@ data:
chart_name: osh-infra-ceph-config
release: osh-infra-ceph-config
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-osh-infra-ceph-config
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -84,17 +89,17 @@ data:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: true
rgw_keystone_user_and_endpoints: false
storage_secrets: False
ceph: False
rbd_provisioner: False
cephfs_provisioner: False
client_secrets: True
rgw_keystone_user_and_endpoints: False
bootstrap:
enabled: false
enabled: False
conf:
rgw_ks:
enabled: true
enabled: True
source:
type: local
location: ${OSH_PATH}
@ -104,6 +109,38 @@ data:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ldap
data:
chart_name: osh-infra-ldap
release: osh-infra-ldap
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-osh-infra-ldap
install:
no_hooks: false
upgrade:
no_hooks: false
values:
labels:
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: ldap
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-mariadb
@ -111,14 +148,15 @@ data:
chart_name: osh-infra-mariadb
release: osh-infra-mariadb
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-osh-infra-mariadb
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
volume:
enabled: false
pod:
replicas:
server: 1
@ -150,11 +188,14 @@ data:
chart_name: elasticsearch
release: elasticsearch
namespace: osh-infra
wait:
timeout: 3600
labels:
release_group: osh-infra-elasticsearch
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
elasticsearch:
@ -167,7 +208,7 @@ data:
client: 1
monitoring:
prometheus:
enabled: true
enabled: True
labels:
elasticsearch:
node_selector_key: openstack-control-plane
@ -191,11 +232,14 @@ data:
chart_name: fluent-logging
release: fluent-logging
namespace: osh-infra
wait:
timeout: 3600
labels:
release_group: osh-infra-fluent-logging
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
elasticsearch:
@ -204,7 +248,7 @@ data:
password: ${ELASTICSEARCH_ADMIN_PASSWORD}
monitoring:
prometheus:
enabled: true
enabled: True
pod:
replicas:
fluentd: 1
@ -237,11 +281,14 @@ data:
chart_name: kibana
release: kibana
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-kibana
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
elasticsearch:
@ -275,11 +322,14 @@ data:
chart_name: prometheus
release: prometheus
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-prometheus
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
prometheus:
@ -307,11 +357,14 @@ data:
chart_name: prometheus-kube-state-metrics
release: prometheus-kube-state-metrics
namespace: kube-system
wait:
timeout: 1800
labels:
release_group: osh-infra-prometheus-kube-state-metrics
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
kube_state_metrics:
@ -336,11 +389,14 @@ data:
chart_name: prometheus-node-exporter
release: prometheus-node-exporter
namespace: kube-system
wait:
timeout: 1800
labels:
release_group: osh-infra-prometheus-node-exporter
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
node_exporter:
@ -365,11 +421,14 @@ data:
chart_name: prometheus-alertmanager
release: prometheus-alertmanager
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-prometheus-alertmanager
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
alertmanager:
@ -394,11 +453,14 @@ data:
chart_name: grafana
release: grafana
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-grafana
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_db:
@ -455,6 +517,16 @@ data:
- osh-infra-ceph-config
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ldap
data:
description: "LDAP"
sequenced: True
chart_group:
- osh-infra-ldap
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-mariadb
@ -508,6 +580,7 @@ data:
chart_groups:
- osh-infra-ingress-controller
- osh-infra-ceph-config
- osh-infra-ldap
- osh-infra-logging
- osh-infra-monitoring
- osh-infra-mariadb

View File

@ -7,7 +7,6 @@ data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
timeout: 300
values: {}
source:
type: local
@ -24,11 +23,14 @@ data:
chart_name: openstack-ingress-controller
release: openstack-ingress-controller
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openstack-ingress-controller
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
server:
@ -57,11 +59,14 @@ data:
chart_name: openstack-ceph-config
release: openstack-ceph-config
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openstack-ceph-config
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -88,17 +93,17 @@ data:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: true
rgw_keystone_user_and_endpoints: false
storage_secrets: False
ceph: False
rbd_provisioner: False
cephfs_provisioner: False
client_secrets: True
rgw_keystone_user_and_endpoints: False
bootstrap:
enabled: false
enabled: False
conf:
rgw_ks:
enabled: true
enabled: True
source:
type: local
location: ${OSH_PATH}
@ -115,14 +120,15 @@ data:
chart_name: mariadb
release: mariadb
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-mariadb
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
volume:
enabled: false
endpoints:
oslo_db:
auth:
@ -130,7 +136,7 @@ data:
password: ${DB_ADMIN_PASSWORD}
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -154,11 +160,14 @@ data:
chart_name: memcached
release: memcached
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-memcached
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
server:
@ -186,11 +195,14 @@ data:
chart_name: keystone-rabbitmq
release: keystone-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-keystone-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -205,7 +217,7 @@ data:
default: keystone-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -229,11 +241,14 @@ data:
chart_name: keystone
release: keystone
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-keystone
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -313,11 +328,14 @@ data:
chart_name: radosgw-openstack
release: radosgw-openstack
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-radosgw-openstack
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -354,20 +372,20 @@ data:
node_selector_key: openstack-control-plane
node_selector_value: enabled
bootstrap:
enabled: false
enabled: False
conf:
rgw_ks:
enabled: true
enabled: True
network:
public: ${CEPH_NETWORK}
cluster: ${CEPH_NETWORK}
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: false
rgw_keystone_user_and_endpoints: true
storage_secrets: False
ceph: False
rbd_provisioner: False
cephfs_provisioner: False
client_secrets: False
rgw_keystone_user_and_endpoints: True
source:
type: local
location: ${OSH_PATH}
@ -384,11 +402,14 @@ data:
chart_name: glance-rabbitmq
release: glance-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-glance-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -403,7 +424,7 @@ data:
default: glance-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -427,11 +448,14 @@ data:
chart_name: glance
release: glance
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-glance
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -516,11 +540,14 @@ data:
chart_name: cinder-rabbitmq
release: cinder-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-cinder-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -535,7 +562,7 @@ data:
default: cinder-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -559,11 +586,14 @@ data:
chart_name: cinder
release: cinder
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-cinder
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -659,11 +689,14 @@ data:
chart_name: openvswitch
release: openvswitch
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openvswitch
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
ovs:
@ -685,11 +718,14 @@ data:
chart_name: libvirt
release: libvirt
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-libvirt
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
labels:
agent:
@ -712,11 +748,14 @@ data:
chart_name: nova-rabbitmq
release: nova-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-nova-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -731,7 +770,7 @@ data:
default: nova-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -755,11 +794,10 @@ data:
chart_name: nova
release: nova
namespace: openstack
timeout: 1800
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -909,11 +947,14 @@ data:
chart_name: neutron-rabbitmq
release: neutron-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-neutron-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -928,7 +969,7 @@ data:
default: neutron-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -952,11 +993,10 @@ data:
chart_name: neutron
release: neutron
namespace: openstack
timeout: 1800
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -1077,11 +1117,14 @@ data:
chart_name: heat-rabbitmq
release: heat-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-heat-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -1096,7 +1139,7 @@ data:
default: heat-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -1120,11 +1163,14 @@ data:
chart_name: heat
release: heat
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-heat
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -1216,11 +1262,14 @@ data:
chart_name: barbican-rabbitmq
release: barbican-rabbitmq
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-barbican-rabbitmq
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
values:
endpoints:
oslo_messaging:
@ -1235,7 +1284,7 @@ data:
default: barbican-rabbitmq-exporter
monitoring:
prometheus:
enabled: true
enabled: True
labels:
server:
node_selector_key: openstack-control-plane
@ -1259,11 +1308,14 @@ data:
chart_name: barbican
release: barbican
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-barbican
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
@ -1339,11 +1391,14 @@ data:
chart_name: prometheus-openstack-exporter
release: prometheus-openstack-exporter
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-prometheus-openstack-exporter
install:
no_hooks: false
no_hooks: False
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job