]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #40217 from liewegas/cephadm-default-image-pacific
authorJosh Durgin <jdurgin@redhat.com>
Tue, 30 Mar 2021 20:11:36 +0000 (13:11 -0700)
committerGitHub <noreply@github.com>
Tue, 30 Mar 2021 20:11:36 +0000 (13:11 -0700)
pacific: cephadm: update default image (DNM until right before final release)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/cephadm/cephadm

index ed01cbfd7945082121834a54a1776b4e0954398a,a22ae50561bb447b217cce9c546a049e0e40affc..e0b5ddd7d1f6dda2ef53e51792a3a8efe5e90c66
@@@ -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'