From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 30 Mar 2021 20:11:36 +0000 (-0700)
Subject: Merge pull request #40217 from liewegas/cephadm-default-image-pacific
X-Git-Tag: v16.2.0~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b2d66186ab11585b5ac788ea607ff1b40ea584e;p=ceph.git

Merge pull request #40217 from liewegas/cephadm-default-image-pacific

pacific: cephadm: update default image (DNM until right before final release)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

2b2d66186ab11585b5ac788ea607ff1b40ea584e
diff --cc src/cephadm/cephadm
index ed01cbfd7945,a22ae50561bb..e0b5ddd7d1f6
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -45,9 -45,8 +45,9 @@@ from urllib.error import HTTPErro
  from urllib.request import urlopen
  
  # Default container images -----------------------------------------------------
- DEFAULT_IMAGE = 'docker.io/ceph/daemon-base:latest-pacific-devel'
+ DEFAULT_IMAGE = 'docker.io/ceph/ceph:v16'
  DEFAULT_IMAGE_IS_MASTER = False
 +DEFAULT_IMAGE_RELEASE = 'pacific'
  DEFAULT_PROMETHEUS_IMAGE = 'docker.io/prom/prometheus:v2.18.1'
  DEFAULT_NODE_EXPORTER_IMAGE = 'docker.io/prom/node-exporter:v0.18.1'
  DEFAULT_GRAFANA_IMAGE = 'docker.io/ceph/ceph-grafana:6.7.4'