openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Bump ceph/daemon container image to v3.2.10" into stable/rocky

This commit is contained in:
Zuul 2019-12-26 19:49:46 +00:00 committed by Gerrit Code Review
parent a4aecaaca5 51e5077751
commit 8841f7895c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/container_image_prepare_defaults.yaml
View File

@ -27,7 +27,7 @@ parameter_defaults:
# Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph
ceph_image: daemon
ceph_tag: v3.2.8-stable-3.2-luminous-centos-7-x86_64
ceph_tag: v3.2.10-stable-3.2-luminous-centos-7-x86_64
# Container image name components for OpenShift images.
# Only used if OpenShift is deployed.

2
container-images/overcloud_containers.yaml
View File

@ -207,7 +207,7 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleorocky/centos-binary-zaqar:current-tripleo
image_source: kolla
- imagename: docker.io/ceph/daemon:v3.2.8-stable-3.2-luminous-centos-7-x86_64
- imagename: docker.io/ceph/daemon:v3.2.10-stable-3.2-luminous-centos-7-x86_64
image_source: ceph
- imagename: docker.io/tripleorocky/centos-binary-tempest:current-tripleo
image_source: kolla

2
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -187,7 +187,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'namespace': 'docker.io/tripleorocky',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.2.8-stable-3.2-luminous-centos-7-x86_64',
'ceph_tag': 'v3.2.10-stable-3.2-luminous-centos-7-x86_64',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',