From 9666d7c26ac63e07d96524704fa474a19f76211f Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 14 Sep 2017 22:48:11 +0200 Subject: [PATCH] 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 90e9ef9f4c51920564200b4a5063afc18bed4e10) --- container-images/overcloud_containers.yaml | 2 +- container-images/overcloud_containers.yaml.j2 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 955719383..ed7f547d2 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -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 diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index db711bed0..7b946578c 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -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