Merge "Use quay.ceph.io to pull the Ceph Dashboard related images" into stable/train
This commit is contained in:
commit
f87f62f0ce
|
@ -30,18 +30,18 @@ parameter_defaults:
|
||||||
ceph_image: daemon
|
ceph_image: daemon
|
||||||
ceph_tag: v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
ceph_tag: v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
||||||
|
|
||||||
ceph_prometheus_namespace: quay.io/prometheus
|
ceph_prometheus_namespace: quay.ceph.io/prometheus
|
||||||
ceph_prometheus_image: prometheus
|
ceph_prometheus_image: prometheus
|
||||||
ceph_prometheus_tag: v2.7.2
|
ceph_prometheus_tag: v2.7.2
|
||||||
|
|
||||||
ceph_alertmanager_namespace: quay.io/prometheus
|
ceph_alertmanager_namespace: quay.ceph.io/prometheus
|
||||||
ceph_alertmanager_image: alertmanager
|
ceph_alertmanager_image: alertmanager
|
||||||
ceph_alertmanager_tag: v0.16.2
|
ceph_alertmanager_tag: v0.16.2
|
||||||
|
|
||||||
ceph_node_exporter_namespace: quay.io/prometheus
|
ceph_node_exporter_namespace: quay.ceph.io/prometheus
|
||||||
ceph_node_exporter_image: node-exporter
|
ceph_node_exporter_image: node-exporter
|
||||||
ceph_node_exporter_tag: v0.17.0
|
ceph_node_exporter_tag: v0.17.0
|
||||||
|
|
||||||
ceph_grafana_namespace: quay.io/tripleo
|
ceph_grafana_namespace: quay.ceph.io/app-sre
|
||||||
ceph_grafana_image: grafana
|
ceph_grafana_image: grafana
|
||||||
ceph_grafana_tag: 5.2.4
|
ceph_grafana_tag: 5.4.3
|
||||||
|
|
|
@ -197,13 +197,13 @@ container_images:
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
||||||
image_source: ceph
|
image_source: ceph
|
||||||
- imagename: quay.io/prometheus/prometheus:v2.7.2
|
- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/alertmanager:v0.16.2
|
- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/tripleo/grafana:5.2.4
|
- imagename: quay.ceph.io/app-sre/grafana:5.4.3
|
||||||
image_source: grafana
|
image_source: grafana
|
||||||
- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
|
- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
|
||||||
image_source: kolla
|
image_source: kolla
|
||||||
|
|
|
@ -201,11 +201,11 @@ container_images:
|
||||||
imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
|
imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo
|
||||||
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
- imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64
|
||||||
image_source: ceph
|
image_source: ceph
|
||||||
- imagename: quay.io/prometheus/prometheus:v2.7.2
|
- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/alertmanager:v0.16.2
|
- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/prometheus/node-exporter:v0.17.0
|
- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0
|
||||||
image_source: prom
|
image_source: prom
|
||||||
- imagename: quay.io/tripleo/grafana:5.2.4
|
- imagename: quay.ceph.io/app-sre/grafana:5.4.3
|
||||||
image_source: grafana
|
image_source: grafana
|
||||||
|
|
|
@ -254,16 +254,16 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'daemon',
|
'ceph_image': 'daemon',
|
||||||
'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64',
|
'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64',
|
||||||
'ceph_grafana_namespace': 'quay.io/tripleo',
|
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
|
||||||
'ceph_grafana_image': 'grafana',
|
'ceph_grafana_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.4.3',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_prometheus_image': 'prometheus',
|
'ceph_prometheus_image': 'prometheus',
|
||||||
'ceph_prometheus_tag': 'v2.7.2',
|
'ceph_prometheus_tag': 'v2.7.2',
|
||||||
'ceph_alertmanager_namespace': 'quay.io/prometheus',
|
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_alertmanager_image': 'alertmanager',
|
'ceph_alertmanager_image': 'alertmanager',
|
||||||
'ceph_alertmanager_tag': 'v0.16.2',
|
'ceph_alertmanager_tag': 'v0.16.2',
|
||||||
'ceph_node_exporter_namespace': 'quay.io/prometheus',
|
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_node_exporter_image': 'node-exporter',
|
'ceph_node_exporter_image': 'node-exporter',
|
||||||
'ceph_node_exporter_tag': 'v0.17.0',
|
'ceph_node_exporter_tag': 'v0.17.0',
|
||||||
'name_prefix': 'centos-binary-',
|
'name_prefix': 'centos-binary-',
|
||||||
|
@ -281,16 +281,16 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'ceph-daemon',
|
'ceph_image': 'ceph-daemon',
|
||||||
'ceph_tag': 'latest',
|
'ceph_tag': 'latest',
|
||||||
'ceph_grafana_namespace': 'quay.io/tripleo',
|
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
|
||||||
'ceph_grafana_image': 'grafana',
|
'ceph_grafana_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.4.3',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_prometheus_image': 'prometheus',
|
'ceph_prometheus_image': 'prometheus',
|
||||||
'ceph_prometheus_tag': 'v2.7.2',
|
'ceph_prometheus_tag': 'v2.7.2',
|
||||||
'ceph_alertmanager_namespace': 'quay.io/prometheus',
|
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_alertmanager_image': 'alertmanager',
|
'ceph_alertmanager_image': 'alertmanager',
|
||||||
'ceph_alertmanager_tag': 'v0.16.2',
|
'ceph_alertmanager_tag': 'v0.16.2',
|
||||||
'ceph_node_exporter_namespace': 'quay.io/prometheus',
|
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_node_exporter_image': 'node-exporter',
|
'ceph_node_exporter_image': 'node-exporter',
|
||||||
'ceph_node_exporter_tag': 'v0.17.0',
|
'ceph_node_exporter_tag': 'v0.17.0',
|
||||||
'name_prefix': 'prefix-',
|
'name_prefix': 'prefix-',
|
||||||
|
@ -338,16 +338,16 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||||
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
'ceph_namespace': 'quay.ceph.io/ceph-ci',
|
||||||
'ceph_image': 'ceph-daemon',
|
'ceph_image': 'ceph-daemon',
|
||||||
'ceph_tag': 'latest',
|
'ceph_tag': 'latest',
|
||||||
'ceph_grafana_namespace': 'quay.io/tripleo',
|
'ceph_grafana_namespace': 'quay.ceph.io/app-sre',
|
||||||
'ceph_grafana_image': 'grafana',
|
'ceph_grafana_image': 'grafana',
|
||||||
'ceph_grafana_tag': '5.2.4',
|
'ceph_grafana_tag': '5.4.3',
|
||||||
'ceph_prometheus_namespace': 'quay.io/prometheus',
|
'ceph_prometheus_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_prometheus_image': 'prometheus',
|
'ceph_prometheus_image': 'prometheus',
|
||||||
'ceph_prometheus_tag': 'v2.7.2',
|
'ceph_prometheus_tag': 'v2.7.2',
|
||||||
'ceph_alertmanager_namespace': 'quay.io/prometheus',
|
'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_alertmanager_image': 'alertmanager',
|
'ceph_alertmanager_image': 'alertmanager',
|
||||||
'ceph_alertmanager_tag': 'v0.16.2',
|
'ceph_alertmanager_tag': 'v0.16.2',
|
||||||
'ceph_node_exporter_namespace': 'quay.io/prometheus',
|
'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus',
|
||||||
'ceph_node_exporter_image': 'node-exporter',
|
'ceph_node_exporter_image': 'node-exporter',
|
||||||
'ceph_node_exporter_tag': 'v0.17.0',
|
'ceph_node_exporter_tag': 'v0.17.0',
|
||||||
'name_prefix': 'prefix-',
|
'name_prefix': 'prefix-',
|
||||||
|
|
Loading…
Reference in New Issue