openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Bump Ceph container image from 3.0.1 to 3.0.3" into stable/queens

This commit is contained in:
Zuul 2018-04-24 14:41:37 +00:00 committed by Gerrit Code Review
parent 33e0cbe536 2a47555714
commit 5ce4c109a2
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/overcloud_containers.yaml
View File

@ -93,6 +93,6 @@ container_images:
- imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo
- imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo
- imagename: docker.io/tripleomaster/centos-binary-zaqar:current-tripleo
- imagename: docker.io/ceph/daemon:v3.0.1-stable-3.0-luminous-centos-7-x86_64
- imagename: docker.io/ceph/daemon:v3.0.3-stable-3.0-luminous-centos-7-x86_64
- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
- imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo

2
tripleo_common/image/kolla_builder.py
View File

@ -30,7 +30,7 @@ CONTAINER_IMAGES_DEFAULTS = {
'namespace': 'docker.io/tripleomaster',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.0.1-stable-3.0-luminous-centos-7-x86_64',
'ceph_tag': 'v3.0.3-stable-3.0-luminous-centos-7-x86_64',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',

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

@ -167,7 +167,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'namespace': 'docker.io/tripleomaster',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.0.1-stable-3.0-luminous-centos-7-x86_64',
'ceph_tag': 'v3.0.3-stable-3.0-luminous-centos-7-x86_64',
'logging': 'files',
'name_prefix': 'centos-binary-',
'name_suffix': '',