Merge "Uplift all openstack-helm charts except Horizon"

This commit is contained in:
Zuul 2019-06-12 18:02:14 +00:00 committed by Gerrit Code Review
commit d12261dc0c
2 changed files with 32 additions and 32 deletions

View File

@ -189,7 +189,7 @@ metadata:
name: common-addresses name: common-addresses
path: .neutron.external_iface path: .neutron.external_iface
dest: dest:
path: .values.network.auto_bridge_add.br-ex path: .values.conf.auto_bridge_add.br-ex
pattern: 'EXTERNAL_INTERFACE' pattern: 'EXTERNAL_INTERFACE'
data: data:
@ -245,11 +245,11 @@ data:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
network: network:
auto_bridge_add:
br-ex: 'EXTERNAL_INTERFACE'
interface: interface:
tunnel: 'TUNNEL_DEVICE' tunnel: 'TUNNEL_DEVICE'
conf: conf:
auto_bridge_add:
br-ex: 'EXTERNAL_INTERFACE'
logging: logging:
loggers: loggers:
keys: keys:

View File

@ -106,42 +106,42 @@ data:
osh: osh:
barbican: barbican:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: barbican subpath: barbican
type: git type: git
cinder: cinder:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: cinder subpath: cinder
type: git type: git
cinder-htk: cinder-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
glance: glance:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: glance subpath: glance
type: git type: git
glance-htk: glance-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
heat: heat:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: heat subpath: heat
type: git type: git
heat-htk: heat-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
helm_toolkit: helm_toolkit:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
horizon: horizon:
@ -151,107 +151,107 @@ data:
type: git type: git
horizon-htk: horizon-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
ingress: ingress:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: ingress subpath: ingress
type: git type: git
ingress-htk: ingress-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
keystone: keystone:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: keystone subpath: keystone
type: git type: git
keystone-htk: keystone-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
libvirt: libvirt:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: libvirt subpath: libvirt
type: git type: git
libvirt-htk: libvirt-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
mariadb: mariadb:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: mariadb subpath: mariadb
type: git type: git
mariadb-htk: mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
memcached: memcached:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: memcached subpath: memcached
type: git type: git
memcached-htk: memcached-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
neutron: neutron:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: neutron subpath: neutron
type: git type: git
neutron-htk: neutron-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
nova: nova:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 66ba0be81c66c20b5ffae709358970d5937a0202 reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: nova subpath: nova
type: git type: git
nova-htk: nova-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
openvswitch: openvswitch:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: openvswitch subpath: openvswitch
type: git type: git
openvswitch-htk: openvswitch-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
rabbitmq: rabbitmq:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: rabbitmq subpath: rabbitmq
type: git type: git
rabbitmq-htk: rabbitmq-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
tempest: tempest:
location: https://opendev.org/openstack/openstack-helm location: https://opendev.org/openstack/openstack-helm
reference: 9bca5deacde31fce79b556c0d63926144a482b7f reference: 47cb52b67c016aa364db9599db39fef719e4ae07
subpath: tempest subpath: tempest
type: git type: git
tempest-htk: tempest-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: a367bacb4bd3af55dd11dbc5c9855749a123779d reference: 0714b9d7ae08a88565d2c81c1b185fd77efaafca
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
osh_infra: osh_infra: