openstack
/
tripleo-common
Code Issues Proposed changes

Default DockerCephDaemonImage to stable, not master, tag 

Points overcloud_containers.yaml to the stable version of the Ceph
docker image.

Change-Id: I137ca9a005df6e95a59a4d629eb94bda6ef00d3a
Depends-On: I6acac1826271efcd4d1acf6633bde6eb8a653f44
This commit is contained in:
John Fulton 2017-10-04 20:38:16 -04:00
parent e9a82e329e
commit a048d9faa9
2 changed files with 2 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

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

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

@ -2,7 +2,7 @@
{% 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" %}
{% set ceph_tag=ceph_tag or "tag-stable-3.0-jewel-centos-7" %}
{% if name_prefix and not name_prefix.endswith('-') %}
{% set name_prefix=name_prefix + "-" %}