openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Bump ceph/daemon container image to v4.0.8" into stable/stein

This commit is contained in:
Zuul 2019-12-26 19:49:45 +00:00 committed by Gerrit Code Review
parent 13b77d3670 d1298e119a
commit baa350fb0b
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. # Only used if Ceph is deployed.
ceph_namespace: docker.io/ceph ceph_namespace: docker.io/ceph
ceph_image: daemon ceph_image: daemon
ceph_tag: v4.0.4-stable-4.0-nautilus-centos-7-x86_64 ceph_tag: v4.0.8-stable-4.0-nautilus-centos-7-x86_64
# Container image name components for OpenShift images. # Container image name components for OpenShift images.
# Only used if OpenShift is deployed. # Only used if OpenShift is deployed.

2
container-images/overcloud_containers.yaml
View File

@ -203,7 +203,7 @@ container_images:
image_source: kolla image_source: kolla
- imagename: docker.io/tripleostein/centos-binary-zaqar-wsgi:current-tripleo - imagename: docker.io/tripleostein/centos-binary-zaqar-wsgi:current-tripleo
image_source: kolla image_source: kolla
- imagename: docker.io/ceph/daemon:v4.0.4-stable-4.0-nautilus-centos-7-x86_64 - imagename: docker.io/ceph/daemon:v4.0.8-stable-4.0-nautilus-centos-7-x86_64
image_source: ceph image_source: ceph
- imagename: docker.io/tripleostein/centos-binary-tempest:current-tripleo - imagename: docker.io/tripleostein/centos-binary-tempest:current-tripleo
image_source: kolla image_source: kolla

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

@ -236,7 +236,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'namespace': 'docker.io/tripleostein', 'namespace': 'docker.io/tripleostein',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon', 'ceph_image': 'daemon',
'ceph_tag': 'v4.0.4-stable-4.0-nautilus-centos-7-x86_64', 'ceph_tag': 'v4.0.8-stable-4.0-nautilus-centos-7-x86_64',
'name_prefix': 'centos-binary-', 'name_prefix': 'centos-binary-',
'name_suffix': '', 'name_suffix': '',
'tag': 'current-tripleo', 'tag': 'current-tripleo',