From fea9b727fe026a2a81d773cf3249209aa7095e94 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 19 Jul 2017 02:06:33 +0200 Subject: [PATCH] Do not list Ceph specific image in overcloud_images.yaml.j2 Avoid manipulating the DockerCephDaemonImage parameter until the prepare command can deal with non-uniform registry locations. Change-Id: I8e98603a527b72c463010b733bb312a8cd895e51 --- container-images/overcloud_containers.yaml | 1 - container-images/overcloud_containers.yaml.j2 | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 8e8d9fe05..2e89405a0 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -81,4 +81,3 @@ 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 diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index f1302f1a3..40654a533 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -360,4 +360,9 @@ container_images_template: - DockerZaqarConfigImage - DockerZaqarImage -- imagename: "ceph/daemon:tag-build-master-jewel-centos-7" +# FIXME(gfidente): we don't use any prefix here so it would be nice to +# not have the --pull-source registry prepended, we can probably add +# another {{keyword}} to describe where we want and where we do not +#- imagename: "ceph/daemon:tag-build-master-jewel-centos-7" +# params: +# - DockerCephDaemonImage \ No newline at end of file