Merge "Bump ceph/daemon container image to v4.0.10"
This commit is contained in:
commit
9b205af88b
@ -28,7 +28,7 @@ parameter_defaults:
|
||||
# Only used if Ceph is deployed.
|
||||
ceph_namespace: docker.io/ceph
|
||||
ceph_image: daemon
|
||||
ceph_tag: v4.0.8-stable-4.0-nautilus-centos-7-x86_64
|
||||
ceph_tag: v4.0.10-stable-4.0-nautilus-centos-7-x86_64
|
||||
|
||||
ceph_prometheus_namespace: docker.io/prom
|
||||
ceph_prometheus_image: prometheus
|
||||
|
@ -183,7 +183,7 @@ container_images:
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/ceph/daemon:v4.0.8-stable-4.0-nautilus-centos-7-x86_64
|
||||
- imagename: docker.io/ceph/daemon:v4.0.10-stable-4.0-nautilus-centos-7-x86_64
|
||||
image_source: ceph
|
||||
- imagename: docker.io/prom/prometheus:v2.7.2
|
||||
image_source: prom
|
||||
|
@ -272,7 +272,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
|
||||
expected = {
|
||||
'namespace': '192.0.2.0:5000/tripleomaster',
|
||||
'ceph_namespace': 'docker.io/cephh',
|
||||
'ceph_namespace': 'docker.io/ceph',
|
||||
'ceph_image': 'ceph-daemon',
|
||||
'ceph_tag': 'latest',
|
||||
'name_prefix': 'prefix-',
|
||||
@ -302,7 +302,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
expected,
|
||||
builder.container_images_template_inputs(
|
||||
namespace='192.0.2.0:5000/tripleomaster',
|
||||
ceph_namespace='docker.io/cephh',
|
||||
ceph_namespace='docker.io/ceph',
|
||||
ceph_image='ceph-daemon',
|
||||
ceph_tag='latest',
|
||||
name_prefix='prefix',
|
||||
|
Loading…
Reference in New Issue
Block a user