Browse Source

Merge "Enable service specific version of helm toolkit used in OSH services"

tags/v1.1
Zuul 9 months ago
parent
commit
991f250143
20 changed files with 528 additions and 19 deletions
  1. +24
    -1
      global/software/charts/osh/openstack-cinder/cinder.yaml
  2. +24
    -1
      global/software/charts/osh/openstack-cinder/rabbitmq.yaml
  3. +25
    -1
      global/software/charts/osh/openstack-compute-kit/libvirt.yaml
  4. +24
    -1
      global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
  5. +24
    -1
      global/software/charts/osh/openstack-compute-kit/neutron.yaml
  6. +24
    -1
      global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
  7. +24
    -1
      global/software/charts/osh/openstack-compute-kit/nova.yaml
  8. +24
    -1
      global/software/charts/osh/openstack-compute-kit/openvswitch.yaml
  9. +24
    -1
      global/software/charts/osh/openstack-glance/glance.yaml
  10. +24
    -1
      global/software/charts/osh/openstack-glance/rabbitmq.yaml
  11. +24
    -1
      global/software/charts/osh/openstack-heat/heat.yaml
  12. +24
    -1
      global/software/charts/osh/openstack-heat/rabbitmq.yaml
  13. +24
    -1
      global/software/charts/osh/openstack-horizon/horizon.yaml
  14. +25
    -1
      global/software/charts/osh/openstack-ingress-controller/ingress.yaml
  15. +24
    -1
      global/software/charts/osh/openstack-keystone/keystone.yaml
  16. +24
    -1
      global/software/charts/osh/openstack-keystone/rabbitmq.yaml
  17. +24
    -1
      global/software/charts/osh/openstack-mariadb/mariadb.yaml
  18. +24
    -1
      global/software/charts/osh/openstack-memcached/memcached.yaml
  19. +24
    -1
      global/software/charts/osh/openstack-tempest/tempest.yaml
  20. +70
    -0
      global/software/config/versions.yaml

+ 24
- 1
global/software/charts/osh/openstack-cinder/cinder.yaml View File

@@ -286,5 +286,28 @@ data:
formatter_default:
format: "%(message)s"
dependencies:
- osh-helm-toolkit
- cinder-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: cinder-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.cinder-htk
dest:
path: .source
data:
chart_name: cinder-htk
release: cinder-htk
namespace: cinder-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-cinder/rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- cinder-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: cinder-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: cinder-rabbitmq-htk
release: cinder-rabbitmq-htk
namespace: cinder-rabbitmq-htk
values: {}
dependencies: []
...

+ 25
- 1
global/software/charts/osh/openstack-compute-kit/libvirt.yaml View File

@@ -48,4 +48,28 @@ data:
configmap: tenant-ceph-etc
user_secret_name: pvc-tceph-client-key
dependencies:
- osh-helm-toolkit
- libvirt-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: libvirt-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.libvirt-htk
dest:
path: .source
data:
chart_name: libvirt-htk
release: libvirt-htk
namespace: libvirt-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- neutron-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: neutron-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: neutron-rabbitmq-htk
release: neutron-rabbitmq-htk
namespace: neutron-rabbitmq-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-compute-kit/neutron.yaml View File

@@ -335,5 +335,28 @@ data:
ml2_type_vlan:
network_vlan_ranges: external
dependencies:
- osh-helm-toolkit
- neutron-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: neutron-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.neutron-htk
dest:
path: .source
data:
chart_name: neutron-htk
release: neutron-htk
namespace: neutron-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- nova-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: nova-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: nova-rabbitmq-htk
release: nova-rabbitmq-htk
namespace: nova-rabbitmq-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-compute-kit/nova.yaml View File

@@ -415,5 +415,28 @@ data:
formatter_default:
format: "%(message)s"
dependencies:
- osh-helm-toolkit
- nova-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: nova-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.nova-htk
dest:
path: .source
data:
chart_name: nova-htk
release: nova-htk
namespace: nova-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-compute-kit/openvswitch.yaml View File

@@ -47,5 +47,28 @@ data:
node_selector_key: openvswitch
node_selector_value: enabled
dependencies:
- osh-helm-toolkit
- openvswitch-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openvswitch-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.openvswitch-htk
dest:
path: .source
data:
chart_name: openvswitch-htk
release: openvswitch-htk
namespace: openvswitch-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-glance/glance.yaml View File

@@ -293,5 +293,28 @@ data:
formatter_default:
format: "%(message)s"
dependencies:
- osh-helm-toolkit
- glance-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: glance-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.glance-htk
dest:
path: .source
data:
chart_name: glance-htk
release: glance-htk
namespace: glance-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-glance/rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- glance-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: glance-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: glance-rabbitmq-htk
release: glance-rabbitmq-htk
namespace: glance-rabbitmq-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-heat/heat.yaml View File

@@ -292,5 +292,28 @@ data:
formatter_default:
format: "%(message)s"
dependencies:
- osh-helm-toolkit
- heat-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: heat-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.heat-htk
dest:
path: .source
data:
chart_name: heat-htk
release: heat-htk
namespace: heat-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-heat/rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- heat-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: heat-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: heat-rabbitmq-htk
release: heat-rabbitmq-htk
namespace: heat-rabbitmq-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-horizon/horizon.yaml View File

@@ -114,5 +114,28 @@ data:
replicas:
server: 2
dependencies:
- osh-helm-toolkit
- horizon-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: horizon-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.horizon-htk
dest:
path: .source
data:
chart_name: horizon-htk
release: horizon-htk
namespace: horizon-htk
values: {}
dependencies: []
...

+ 25
- 1
global/software/charts/osh/openstack-ingress-controller/ingress.yaml View File

@@ -55,4 +55,28 @@ data:
ingress: 2
error_page: 2
dependencies:
- osh-helm-toolkit
- ingress-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ingress-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.ingress-htk
dest:
path: .source
data:
chart_name: ingress-htk
release: ingress-htk
namespace: ingress-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-keystone/keystone.yaml View File

@@ -254,5 +254,28 @@ data:
node_selector_key: openstack-control-plane
node_selector_value: enabled
dependencies:
- osh-helm-toolkit
- keystone-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: keystone-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.keystone-htk
dest:
path: .source
data:
chart_name: keystone-htk
release: keystone-htk
namespace: keystone-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-keystone/rabbitmq.yaml View File

@@ -93,5 +93,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- keystone-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: keystone-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.rabbitmq-htk
dest:
path: .source
data:
chart_name: keystone-rabbitmq-htk
release: keystone-rabbitmq-htk
namespace: keystone-rabbitmq-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-mariadb/mariadb.yaml View File

@@ -98,5 +98,28 @@ data:
prometheus:
enabled: true
dependencies:
- osh-helm-toolkit
- openstack-mariadb-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-mariadb-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.mariadb-htk
dest:
path: .source
data:
chart_name: openstack-mariadb-htk
release: openstack-mariadb-htk
namespace: openstack-mariadb-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-memcached/memcached.yaml View File

@@ -56,5 +56,28 @@ data:
node_selector_key: openstack-control-plane
node_selector_value: enabled
dependencies:
- osh-helm-toolkit
- memcached-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: memcached-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.memcached-htk
dest:
path: .source
data:
chart_name: memcached-htk
release: memcached-htk
namespace: memcached-htk
values: {}
dependencies: []
...

+ 24
- 1
global/software/charts/osh/openstack-tempest/tempest.yaml View File

@@ -90,5 +90,28 @@ data:
configmap: tenant-ceph-etc
user_secret_name: pvc-tceph-client-key
dependencies:
- osh-helm-toolkit
- tempest-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: tempest-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.osh.tempest-htk
dest:
path: .source
data:
chart_name: tempest-htk
release: tempest-htk
namespace: tempest-htk
values: {}
dependencies: []
...

+ 70
- 0
global/software/config/versions.yaml View File

@@ -114,16 +114,31 @@ data:
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: cinder
type: git
cinder-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
glance:
location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: glance
type: git
glance-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
heat:
location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: heat
type: git
heat-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
helm_toolkit:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
@@ -134,56 +149,111 @@ data:
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: horizon
type: git
horizon-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
ingress:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: ingress
type: git
ingress-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
keystone:
location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: keystone
type: git
keystone-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
libvirt:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: libvirt
type: git
libvirt-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
mariadb:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: mariadb
type: git
mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
memcached:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: memcached
type: git
memcached-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
neutron:
location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: neutron
type: git
neutron-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
nova:
location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202
subpath: nova
type: git
nova-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
openvswitch:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: openvswitch
type: git
openvswitch-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
rabbitmq:
location: https://opendev.org/openstack/openstack-helm-infra
reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e
subpath: rabbitmq
type: git
rabbitmq-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
tempest:
location: https://opendev.org/openstack/openstack-helm
reference: 9bca5deacde31fce79b556c0d63926144a482b7f
subpath: tempest
type: git
tempest-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d
subpath: helm-toolkit
type: git
osh_infra:
elasticsearch:
location: https://opendev.org/openstack/openstack-helm-infra

Loading…
Cancel
Save