Merge "Uplift MaaS to fix resource-import hanging"

This commit is contained in:
Zuul 2019-05-30 20:58:14 +00:00 committed by Gerrit Code Review
commit f7983e044b

View File

@ -428,12 +428,12 @@ data:
type: git type: git
maas: maas:
location: https://opendev.org/airship/maas location: https://opendev.org/airship/maas
reference: 538fb11887272ec6f9dce67423ef503ec31b1d8e reference: 3b453bd8d6f3b53160faac7bd2a4ab16214c121b
subpath: charts/maas subpath: charts/maas
type: git type: git
maas-htk: maas-htk:
location: https://opendev.org/openstack/openstack-helm-infra location: https://opendev.org/openstack/openstack-helm-infra
reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e reference: 9efb353b83c59e891b1b85dc6567044de0f5ac17
subpath: helm-toolkit subpath: helm-toolkit
type: git type: git
mariadb: mariadb:
@ -622,12 +622,12 @@ data:
ingress: {} ingress: {}
keystone: {} keystone: {}
maas: maas:
bootstrap: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 bootstrap: quay.io/airshipit/maas-region-controller:65b885a10d1af0ed804d23a3c0f325ef196f6c97
db_sync: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 db_sync: quay.io/airshipit/maas-region-controller:65b885a10d1af0ed804d23a3c0f325ef196f6c97
export_api_key: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 export_api_key: quay.io/airshipit/maas-region-controller:65b885a10d1af0ed804d23a3c0f325ef196f6c97
maas_cache: quay.io/airshipit/sstream-cache:928cddad00da3d91ef1027e5a6c4d11da74d7570 maas_cache: quay.io/airshipit/sstream-cache:65b885a10d1af0ed804d23a3c0f325ef196f6c97
maas_rack: quay.io/airshipit/maas-rack-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 maas_rack: quay.io/airshipit/maas-rack-controller:65b885a10d1af0ed804d23a3c0f325ef196f6c97
maas_region: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 maas_region: quay.io/airshipit/maas-region-controller:65b885a10d1af0ed804d23a3c0f325ef196f6c97
mariadb: {} mariadb: {}
memcached: {} memcached: {}
pegleg: pegleg: