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

This commit is contained in:
Jenkins 2017-07-24 15:07:11 +00:00 committed by Gerrit Code Review
commit f9af11a05d
2 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -361,4 +361,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