openstack
/
tripleo-common
Code Issues Proposed changes

Upgrade docker ceph container 

Upgrades to  v3.1.0-stable-3.1-luminous-centos-7-x86_64 to read config
from ceph conf file [1]

[1] 24bd34a6ed


Change-Id: I2658011d5d50cd6f7c6d12e1923e4a3b15f64010
Closes-Bug: 1792296
(cherry picked from commit c7945101b3)
This commit is contained in:
Quique Llorente 2018-09-18 14:49:56 +02:00 committed by Giulio Fidente
parent 849726a2ca
commit ed76b76819
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

@ -103,7 +103,7 @@ container_images:
- imagename: docker.io/tripleorocky/centos-binary-swift-proxy-server:current-tripleo
- imagename: docker.io/tripleorocky/centos-binary-tripleo-ui:current-tripleo
- imagename: docker.io/tripleorocky/centos-binary-zaqar:current-tripleo
- imagename: docker.io/ceph/daemon:v3.0.3-stable-3.0-luminous-centos-7-x86_64
- imagename: docker.io/ceph/daemon:v3.1.0-stable-3.1-luminous-centos-7-x86_64
- imagename: docker.io/tripleorocky/centos-binary-tempest:current-tripleo
- imagename: docker.io/tripleorocky/centos-binary-rsyslog-base:current-tripleo
- imagename: docker.io/openshift/origin:v3.9.0

2
tripleo_common/image/kolla_builder.py
View File

@ -33,7 +33,7 @@ CONTAINER_IMAGE_PREPARE_PARAM = [{
'namespace': 'docker.io/tripleorocky',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.0.3-stable-3.0-luminous-centos-7-x86_64',
'ceph_tag': 'v3.1.0-stable-3.1-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/tripleorocky',
'ceph_namespace': 'docker.io/ceph',
'ceph_image': 'daemon',
'ceph_tag': 'v3.0.3-stable-3.0-luminous-centos-7-x86_64',
'ceph_tag': 'v3.1.0-stable-3.1-luminous-centos-7-x86_64',
'name_prefix': 'centos-binary-',
'name_suffix': '',
'tag': 'current-tripleo',