openstack
/
tripleo-common
Code Issues Proposed changes

Always use docker.io for ceph_namespace 

While the namespace variable does not carry the registry address,
which is defaulted to docker.io in tripleoclient, the ceph_namespace
variable needs one.

Also set the DockerCephDaemonImage value for CephClient and
CephExternal services which depend on CephBase.

Change-Id: I606158f11cb8d92876fdc4a01b7be482f471955b
Closes-Bug: #1717359
(cherry picked from commit 90e9ef9f4c)
This commit is contained in:
Giulio Fidente 2017-09-14 22:48:11 +02:00
parent d467e6b45f
commit 9666d7c26a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/overcloud_containers.yaml
View File

@ -86,4 +86,4 @@ container_images:
- imagename: tripleoupstream/centos-binary-swift-proxy-server:latest
- imagename: tripleoupstream/centos-binary-tacker:latest
- imagename: tripleoupstream/centos-binary-zaqar:latest
- imagename: ceph/daemon:tag-build-master-jewel-centos-7
- imagename: docker.io/ceph/daemon:tag-build-master-jewel-centos-7

4
container-images/overcloud_containers.yaml.j2
View File

@ -1,6 +1,6 @@
{% set namespace=namespace or "tripleoupstream" %}
{% set ceph_namespace=ceph_namespace or "ceph" %}
{% set ceph_namespace=ceph_namespace or "docker.io/ceph" %}
{% set ceph_image=ceph_image or "daemon" %}
{% set ceph_tag=ceph_tag or "tag-build-master-jewel-centos-7" %}
@ -643,6 +643,8 @@ container_images_template:
params:
- DockerCephDaemonImage
services:
- OS::TripleO::Services::CephClient
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephOSD