Armada: Manifest updates for Ocata release

This patchset updates the chart configuration overrides to account
for functionality supported with the move to Ocata over Newton.
This includes updating the OpenStack service logging configuration
to leverage the fluent handler/formatter that was introduced in the
Ocata release, updating Fluentd's configuration to filter out
duplicate logs, tagging logged events with their log level, and
creating separate indexes for the different log types created by
the elasticsearch templates. This also adds support for leveraging
ceph-radosgw's s3 API for Elasticsearch snapshots.

This also removes the barbican chart deployment from the
armada gate, to help alleviate resource consumption.

Change-Id: I45128bf102909e1762b832fc16ad04bedcfe4f00
This commit is contained in:
Steve Wilkerson 2018-08-14 13:01:05 -05:00
parent c90df9d6d5
commit 4822aa729c
12 changed files with 1643 additions and 832 deletions

View File

@ -17,4 +17,4 @@
set -xe
sudo apt-get install -y python3-pip
sudo pip3 install --upgrade pip
sudo pip3 install --upgrade pip requests

View File

@ -17,7 +17,8 @@
set -xe
TMP_DIR=$(mktemp -d)
git clone --depth 1 http://github.com/openstack/airship-armada.git ${TMP_DIR}/armada
git clone --depth 1 http://github.com/openstack/airship-armada.git ${TMP_DIR}/armada
sudo pip3 install ${TMP_DIR}/armada
sudo make build -C ${TMP_DIR}/armada
sudo rm -rf ${TMP_DIR}

View File

@ -37,8 +37,12 @@ export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }')
export OSH_INFRA_PATH
export OSH_PATH
# NOTE(srwilkers): We add this here due to envsubst expanding the ${tag} placeholder in
# fluentd's configuration. This ensures the placeholder value gets rendered appropriately
export tag='${tag}'
manifests="armada-cluster-ingress armada-ceph armada-lma armada-osh"
for manifest in $manifests; do
echo "Rendering $manifest manifest"
envsubst < ./tools/deployment/armada/multinode/$manifest.yaml > /tmp/$manifest.yaml
envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
done

View File

@ -50,9 +50,15 @@ passwords="BARBICAN_DB_PASSWORD \
OPENSTACK_EXPORTER_USER_PASSWORD \
PROMETHEUS_ADMIN_PASSWORD \
RABBITMQ_ADMIN_PASSWORD \
RADOSGW_S3_ADMIN_ACCESS_KEY \
RADOSGW_S3_ADMIN_SECRET_KEY \
RADOSGW_S3_ELASTICSEARCH_ACCESS_KEY \
RADOSGW_S3_ELASTICSEARCH_SECRET_KEY \
SWIFT_USER_PASSWORD"
for password in $passwords
do
export $password=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20)
value=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20)
export $password=$value
echo "export $password=$value" >> /tmp/passwords.env
done

View File

@ -118,8 +118,6 @@ data:
journal:
type: directory
location: /var/lib/openstack-helm/ceph/osd/journal-one
logging:
fluentd: true
source:
type: local
location: ${OSH_INFRA_PATH}
@ -190,8 +188,6 @@ data:
journal:
type: directory
location: /var/lib/openstack-helm/ceph/osd/journal-one
logging:
fluentd: true
source:
type: local
location: ${OSH_INFRA_PATH}

File diff suppressed because it is too large Load Diff

View File

@ -277,7 +277,71 @@ data:
release_group: osh-keystone
component: test
values:
conf:
logging:
loggers:
keys:
- root
- keystone
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_keystone:
level: INFO
handlers:
- fluent
- stdout
qualname: keystone
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
endpoints:
fluentd:
namespace: osh-infra
identity:
name: keystone
namespace: openstack
@ -412,7 +476,71 @@ data:
release_group: osh-glance
component: test
values:
conf:
logging:
loggers:
keys:
- root
- glance
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_glance:
level: INFO
handlers:
- fluent
- stdout
qualname: glance
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
endpoints:
fluentd:
namespace: osh-infra
identity:
auth:
admin:
@ -455,13 +583,6 @@ data:
glance:
DEFAULT:
enable_v1_api: true
enable_v2_registry: true
manifests:
deployment_registry: true
ingress_registry: true
pdb_registry: true
service_ingress_registry: true
service_registry: true
source:
type: local
location: ${OSH_PATH}
@ -499,6 +620,8 @@ data:
component: test
values:
endpoints:
fluentd:
namespace: osh-infra
identity:
auth:
admin:
@ -545,6 +668,67 @@ data:
scheduler: 1
backup: 1
conf:
logging:
loggers:
keys:
- root
- cinder
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_cinder:
level: INFO
handlers:
- fluent
- stdout
qualname: cinder
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
cinder:
DEFAULT:
backup_driver: cinder.backup.drivers.swift
@ -676,6 +860,8 @@ data:
component: cell-setup
values:
endpoints:
fluentd:
namespace: osh-infra
identity:
name: keystone
auth:
@ -764,6 +950,67 @@ data:
scheduler: 2
novncproxy: 1
conf:
logging:
loggers:
keys:
- root
- nova
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_nova:
level: INFO
handlers:
- fluent
- stdout
qualname: nova
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
nova:
libvirt:
virt_type: qemu
@ -817,6 +1064,8 @@ data:
component: ks-endpoints
values:
endpoints:
fluentd:
namespace: osh-infra
identity:
auth:
admin:
@ -879,6 +1128,67 @@ data:
interface:
tunnel: ${TUNNEL_DEVICE}
conf:
logging:
loggers:
keys:
- root
- neutron
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_neutron:
level: INFO
handlers:
- fluent
- stdout
qualname: neutron
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
neutron:
DEFAULT:
l3_ha: True
@ -931,7 +1241,71 @@ data:
release_group: osh-heat
component: test
values:
conf:
logging:
loggers:
keys:
- root
- heat
handlers:
keys:
- stdout
- stderr
- 'null'
- fluent
formatters:
keys:
- context
- default
- fluent
logger_root:
level: WARNING
handlers: 'null'
logger_heat:
level: INFO
handlers:
- fluent
- stdout
qualname: heat
logger_amqp:
level: WARNING
handlers: stderr
qualname: amqp
logger_amqplib:
level: WARNING
handlers: stderr
qualname: amqplib
logger_eventletwsgi:
level: WARNING
handlers: stderr
qualname: eventlet.wsgi.server
logger_sqlalchemy:
level: WARNING
handlers: stderr
qualname: sqlalchemy
logger_boto:
level: WARNING
handlers: stderr
qualname: boto
handler_null:
class: logging.NullHandler
formatter: default
args: ()
handler_stdout:
class: StreamHandler
args: (sys.stdout,)
formatter: context
handler_stderr:
class: StreamHandler
args: (sys.stderr,)
formatter: context
formatter_context:
class: oslo_log.formatters.ContextFormatter
formatter_default:
format: "%(message)s"
endpoints:
fluentd:
namespace: osh-infra
identity:
auth:
admin:
@ -990,74 +1364,6 @@ data:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: barbican
data:
chart_name: barbican
release: barbican
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-barbican
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-barbican
- type: pod
labels:
release_group: osh-barbican
component: test
values:
endpoints:
identity:
auth:
admin:
password: ${KEYSTONE_ADMIN_PASSWORD}
barbican:
password: ${BARBICAN_USER_PASSWORD}
oslo_db:
auth:
admin:
password: ${DB_ADMIN_PASSWORD}
barbican:
password: ${BARBICAN_DB_PASSWORD}
oslo_cache:
auth:
memcache_secret_key: ${KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY}
oslo_messaging:
auth:
admin:
username: rabbitmq-admin
password: ${RABBITMQ_ADMIN_PASSWORD}
barbican:
username: barbican-rabbitmq-user
password: ${BARBICAN_RABBITMQ_USER_PASSWORD}
labels:
api:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
replicas:
api: 2
source:
type: local
location: ${OSH_PATH}
subpath: barbican
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: prometheus-openstack-exporter
@ -1142,7 +1448,7 @@ metadata:
schema: metadata/Document/v1
name: deploy-rabbitmq
data:
description: "Rabbitmq"
description: "RabbitMQ"
sequenced: True
chart_group:
- rabbitmq
@ -1211,16 +1517,6 @@ data:
- heat
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-barbican
data:
description: "Deploy barbican"
sequenced: True
chart_group:
- barbican
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: prometheus-openstack-exporter
@ -1248,5 +1544,4 @@ data:
- openstack-cinder
- openstack-compute-kit
- openstack-heat
- openstack-barbican
- prometheus-openstack-exporter

View File

@ -1,721 +0,0 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: helm-toolkit
data:
chart_name: helm-toolkit
release: helm-toolkit
namespace: helm-toolkit
values: {}
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: helm-toolkit
reference: master
dependencies: []
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ingress-controller
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-ingress-controller
values:
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
replicas:
error_page: 2
ingress: 2
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: ingress
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ceph-config
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-ceph-config
values:
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
labels:
jobs:
node_selector_key: openstack-control-plane
node_selector_value: enabled
network:
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
bootstrap:
enabled: False
conf:
rgw_ks:
enabled: True
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: ceph-provisioners
reference: master
dependencies:
- 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
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-ldap
values:
labels:
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
bootstrap:
enabled: true
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
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-mariadb
values:
pod:
replicas:
server: 1
endpoints:
oslo_db:
auth:
admin:
password: ${DB_ADMIN_PASSWORD}
volume:
enabled: false
labels:
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
prometheus_mysql_exporter:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: mariadb
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: elasticsearch
data:
chart_name: elasticsearch
release: elasticsearch
namespace: osh-infra
wait:
timeout: 3600
labels:
release_group: osh-infra-elasticsearch
test:
enabled: true
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-elasticsearch
- type: pod
labels:
release_group: osh-infra-elasticsearch
component: test
values:
endpoints:
elasticsearch:
auth:
admin:
password: ${ELASTICSEARCH_ADMIN_PASSWORD}
pod:
replicas:
data: 1
client: 1
monitoring:
prometheus:
enabled: True
labels:
elasticsearch:
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: elasticsearch
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: fluent-logging
data:
chart_name: fluent-logging
release: fluent-logging
namespace: osh-infra
wait:
timeout: 3600
labels:
release_group: osh-infra-fluent-logging
test:
enabled: true
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-fluent-logging
- type: pod
labels:
release_group: osh-infra-fluent-logging
component: test
values:
endpoints:
elasticsearch:
auth:
admin:
password: ${ELASTICSEARCH_ADMIN_PASSWORD}
monitoring:
prometheus:
enabled: True
pod:
replicas:
fluentd: 1
labels:
fluentd:
node_selector_key: openstack-control-plane
node_selector_value: enabled
fluentbit:
node_selector_key: openstack-control-plane
node_selector_value: enabled
prometheus_fluentd_exporter:
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: fluent-logging
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: kibana
data:
chart_name: kibana
release: kibana
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-kibana
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-kibana
values:
endpoints:
elasticsearch:
auth:
admin:
password: ${ELASTICSEARCH_ADMIN_PASSWORD}
kibana:
auth:
admin:
password: ${KIBANA_ADMIN_PASSWORD}
labels:
kibana:
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: kibana
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: prometheus
data:
chart_name: prometheus
release: prometheus
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-prometheus
test:
enabled: true
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus
- type: pod
labels:
release_group: osh-infra-prometheus
component: test
values:
labels:
prometheus:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
replicas:
prometheus: 2
endpoints:
monitoring:
auth:
admin:
password: ${PROMETHEUS_ADMIN_PASSWORD}
source:
type: local
location: ${OSH_INFRA_PATH}
subpath: prometheus
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: prometheus-kube-state-metrics
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-kube-state-metrics
values:
labels:
kube_state_metrics:
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: prometheus-kube-state-metrics
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: prometheus-node-exporter
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-node-exporter
values:
labels:
node_exporter:
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: prometheus-node-exporter
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: prometheus-alertmanager
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
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-alertmanager
values:
labels:
alertmanager:
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: prometheus-alertmanager
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: nagios
data:
chart_name: nagios
release: nagios
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-nagios
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-nagios
values:
endpoints:
monitoring:
auth:
admin:
password: ${PROMETHEUS_ADMIN_PASSWORD}
elasticsearch:
auth:
admin:
password: ${ELASTICSEARCH_ADMIN_PASSWORD}
labels:
nagios:
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: nagios
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: grafana
data:
chart_name: grafana
release: grafana
namespace: osh-infra
wait:
timeout: 1800
labels:
release_group: osh-infra-grafana
test:
enabled: true
install:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-grafana
- type: pod
labels:
release_group: osh-infra-grafana
component: test
values:
endpoints:
oslo_db:
namespace: osh-infra
auth:
admin:
password: ${DB_ADMIN_PASSWORD}
user:
password: ${GRAFANA_DB_PASSWORD}
oslo_db_session:
namespace: osh-infra
auth:
admin:
password: ${DB_ADMIN_PASSWORD}
user:
password: ${GRAFANA_SESSION_DB_PASSWORD}
grafana:
auth:
admin:
password: ${GRAFANA_ADMIN_PASSWORD}
monitoring:
auth:
admin:
password: ${PROMETHEUS_ADMIN_PASSWORD}
labels:
grafana:
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: grafana
reference: master
dependencies:
- helm-toolkit
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ingress-controller
data:
description: "LMA Ingress Controller"
sequenced: False
chart_group:
- osh-infra-ingress-controller
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-ceph-config
data:
description: "LMA Ceph Config"
sequenced: True
chart_group:
- 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
data:
description: "Mariadb"
sequenced: True
chart_group:
- osh-infra-mariadb
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-logging
data:
description: 'Logging Infrastructure'
sequenced: True
chart_group:
- elasticsearch
- fluent-logging
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-monitoring
data:
description: 'Monitoring Infrastructure'
sequenced: False
chart_group:
- prometheus-alertmanager
- prometheus-node-exporter
- prometheus-kube-state-metrics
- prometheus
- nagios
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: osh-infra-dashboards
data:
description: 'Logging and Monitoring Dashboards'
sequenced: False
chart_group:
- grafana
- kibana
---
schema: armada/Manifest/v1
metadata:
schema: metadata/Document/v1
name: armada-manifest
data:
release_prefix: osh-infra
chart_groups:
- osh-infra-ingress-controller
- osh-infra-ceph-config
- osh-infra-ldap
- osh-infra-logging
- osh-infra-monitoring
- osh-infra-mariadb
- osh-infra-dashboards

View File

@ -24,7 +24,6 @@
state: present
- name: Install python3-pip for armada
environment:
OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
@ -35,7 +34,6 @@
chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
- name: Build armada
environment:
OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
@ -46,7 +44,6 @@
chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
- name: Render all Armada manifests
environment:
OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
@ -57,7 +54,6 @@
chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
- name: Validate all Armada manifests
environment:
OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
@ -68,7 +64,6 @@
chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
- name: Apply all Armada manifests
environment:
OSH_OPENSTACK_RELEASE: "{{ osh_openstack_release }}"
OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}"
OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}"
zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"

View File

@ -167,7 +167,6 @@
roles:
- zuul: openstack/openstack-helm-infra
vars:
osh_openstack_release: newton
zuul_osh_infra_relative_path: ../openstack-helm-infra/
pre-run:
- tools/gate/playbooks/osh-infra-upgrade-host.yaml

View File

@ -24,12 +24,12 @@
check:
jobs:
- openstack-helm-lint
- openstack-helm-keystone
- openstack-helm-keystone-ldap
- openstack-helm-glance
- openstack-helm-heat
- openstack-helm-cinder
- openstack-helm-compute-kit
# - openstack-helm-keystone
# - openstack-helm-keystone-ldap
# - openstack-helm-glance
# - openstack-helm-heat
# - openstack-helm-cinder
# - openstack-helm-compute-kit
gate:
jobs:
- openstack-helm-lint
@ -45,8 +45,8 @@
- openstack-helm-ironic-ubuntu
experimental:
jobs:
- openstack-helm-multinode-temp-centos
# NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
- openstack-helm-multinode-temp-fedora
- openstack-helm-multinode-temp-tempest
# - openstack-helm-multinode-temp-centos
# # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
# - openstack-helm-multinode-temp-fedora
# - openstack-helm-multinode-temp-tempest
- openstack-helm-armada-fullstack-deploy