[AIAB] Fix glance and heat overrides

Add explicit glance and heat overrides, this fixes problems
when two manifests with identical names are present,
one manifest comes from the type level, another one comes
from the site level, this leads to random manifest being
picked up during service deployment by Armada.

Change-Id: I87f6cce910dcf1f87370ba231077451990b245ee
This commit is contained in:
Evgeny L 2019-06-04 20:38:42 +00:00
parent f7983e044b
commit 8cf3062dcd
5 changed files with 45 additions and 12 deletions

View File

@ -0,0 +1,19 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-glance-aiab
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: openstack-glance-chart-group-global
component: glance
actions:
- method: replace
path: .chart_group
storagePolicy: cleartext
data:
chart_group:
- glance-rabbitmq
- glance-aiab

View File

@ -2,13 +2,12 @@
schema: armada/Chart/v1 schema: armada/Chart/v1
metadata: metadata:
schema: metadata/Document/v1 schema: metadata/Document/v1
name: glance name: glance-aiab
replacement: true
layeringDefinition: layeringDefinition:
abstract: false abstract: false
layer: site layer: site
parentSelector: parentSelector:
name: glance-global name: glance-type
actions: actions:
- method: merge - method: merge
path: . path: .
@ -16,9 +15,5 @@ metadata:
data: data:
values: values:
pod:
replicas:
api: 1
registry: 1
storage: pvc storage: pvc
... ...

View File

@ -0,0 +1,20 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-heat-aiab
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: openstack-heat-chart-group-global
component: heat
actions:
- method: replace
path: .chart_group
storagePolicy: cleartext
data:
sequenced: true
chart_group:
- heat-rabbitmq
- heat-aiab

View File

@ -2,13 +2,12 @@
schema: armada/Chart/v1 schema: armada/Chart/v1
metadata: metadata:
schema: metadata/Document/v1 schema: metadata/Document/v1
name: heat name: heat-aiab
replacement: true
layeringDefinition: layeringDefinition:
abstract: false abstract: false
layer: site layer: site
parentSelector: parentSelector:
name: heat-global name: heat-type
actions: actions:
- method: merge - method: merge
path: . path: .

View File

@ -36,8 +36,8 @@ data:
- openstack-mariadb - openstack-mariadb
- openstack-memcached - openstack-memcached
- openstack-keystone - openstack-keystone
- openstack-glance - openstack-glance-aiab
- openstack-compute-kit - openstack-compute-kit
- openstack-heat - openstack-heat-aiab
- openstack-horizon - openstack-horizon
... ...