From c7d204ce379c2003d8071a8bbfb1ec6003f4be39 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 22 Jan 2021 10:01:10 -0500 Subject: [PATCH] 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 (cherry picked from commit 7d567719756199f34d6cb05347435905a8c4aece) --- group_vars/all.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index fc1dc6439..936a9236b 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -550,7 +550,7 @@ dummy: # DOCKER # ########## #ceph_docker_image: "ceph/daemon" -#ceph_docker_image_tag: latest +#ceph_docker_image_tag: latest-octopus #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 2f6003c19..d9926e33c 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -542,7 +542,7 @@ ceph_tcmalloc_max_total_thread_cache: 0 # DOCKER # ########## ceph_docker_image: "ceph/daemon" -ceph_docker_image_tag: latest +ceph_docker_image_tag: latest-octopus ceph_docker_registry: docker.io ceph_docker_registry_auth: false #ceph_docker_registry_username: -- 2.47.3