ceph-defaults: change default ceph container tag

The "latest" ceph container tag references the latest stable release
(octopus at the moment). "latest" is an alias on "latest-octopus".
On the devel branch we should use "latest-master" tag instead.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a0a29111aa2c5fa2c715b24ca23c26ead9bbde70..77422e96933ee977426faf989c0550220b6ee386 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -555,7 +555,7 @@ dummy:
 # DOCKER #
 ##########
 #ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest
+#ceph_docker_image_tag: latest-master
 #ceph_docker_registry: docker.io
 #ceph_docker_registry_auth: false
 #ceph_docker_registry_username:

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 9015776d8e86e18f7c3ae4509e13877373f9f990..7427e489b13a07a9288dc9676a3887cb1b3d21bb 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -547,7 +547,7 @@ ceph_tcmalloc_max_total_thread_cache: 0
 # DOCKER #
 ##########
 ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest
+ceph_docker_image_tag: latest-master
 ceph_docker_registry: docker.io
 ceph_docker_registry_auth: false
 #ceph_docker_registry_username: