[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
changes/39/663139/4
Evgeny L 3 years ago
parent f7983e044b
commit 8cf3062dcd
  1. 19
      site/aiab/software/charts/osh/openstack-glance/chart-group.yaml
  2. 9
      site/aiab/software/charts/osh/openstack-glance/glance.yaml
  3. 20
      site/aiab/software/charts/osh/openstack-heat/chart-group.yaml
  4. 5
      site/aiab/software/charts/osh/openstack-heat/heat.yaml
  5. 4
      site/aiab/software/full-site.yaml

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

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

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

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

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

Loading…
Cancel
Save