openstack
/
tripleo-common
Code Issues Proposed changes

Update the ceph container url to quay.io 

In order to get rid of pulling non-tripleo containers from docker.io
to avoid rate limit issues, we are switching to
quay.ceph.io/ceph-ci/daemon:v3.2.14-stable-3.2-luminous-centos-7-x86_64

Depends-On: https://review.opendev.org/#/c/759211/

Change-Id: Ie13f4c9dfb3970586786137a84078e3aecc3a12e
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
This commit is contained in:
Chandan Kumar (raukadah) 2020-10-22 09:45:47 +05:30
parent 84755aaba8
commit c182010e8d
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

@ -94,6 +94,6 @@ container_images:
- imagename: docker.io/tripleoqueens/centos-binary-swift-object:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-swift-object:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-swift-proxy-server:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-swift-proxy-server:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-zaqar:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-zaqar:current-tripleo
- imagename: docker.io/ceph/daemon:v3.2.14-stable-3.2-luminous-centos-7-x86_64 - imagename: quay.ceph.io/ceph-ci/daemon:v3.2.14-stable-3.2-luminous-centos-7-x86_64
- imagename: docker.io/tripleoqueens/centos-binary-tempest:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-tempest:current-tripleo
- imagename: docker.io/tripleoqueens/centos-binary-rsyslog-base:current-tripleo - imagename: docker.io/tripleoqueens/centos-binary-rsyslog-base:current-tripleo

2
tripleo_common/image/kolla_builder.py
View File

@ -28,7 +28,7 @@ from tripleo_common.image import image_uploader
CONTAINER_IMAGES_DEFAULTS = { CONTAINER_IMAGES_DEFAULTS = {
'namespace': 'docker.io/tripleoqueens', 'namespace': 'docker.io/tripleoqueens',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'daemon', 'ceph_image': 'daemon',
'ceph_tag': 'v3.2.14-stable-3.2-luminous-centos-7-x86_64', 'ceph_tag': 'v3.2.14-stable-3.2-luminous-centos-7-x86_64',
'name_prefix': 'centos-binary-', 'name_prefix': 'centos-binary-',

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

@ -165,7 +165,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
self.assertEqual( self.assertEqual(
{ {
'namespace': 'docker.io/tripleoqueens', 'namespace': 'docker.io/tripleoqueens',
'ceph_namespace': 'docker.io/ceph', 'ceph_namespace': 'quay.ceph.io/ceph-ci',
'ceph_image': 'daemon', 'ceph_image': 'daemon',
'ceph_tag': 'v3.2.14-stable-3.2-luminous-centos-7-x86_64', 'ceph_tag': 'v3.2.14-stable-3.2-luminous-centos-7-x86_64',
'logging': 'files', 'logging': 'files',