openstack/tripleo-common
Code Issues Proposed changes

Do not list Ceph specific image in overcloud_images.yaml.j2

Browse Source 
Avoid manipulating the DockerCephDaemonImage parameter until
the prepare command can deal with non-uniform registry
locations.

Change-Id: I8e98603a527b72c463010b733bb312a8cd895e51
This commit is contained in:
Giulio Fidente 2017-07-19 02:06:33 +02:00
parent f0ef9ac787
commit fea9b727fe
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

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

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

@ -360,4 +360,9 @@ container_images_template:
- DockerZaqarConfigImage - DockerZaqarConfigImage
- DockerZaqarImage - 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