From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Nov 2019 13:25:48 +0000 (-0600)
Subject: ceph-daemon: switch default image
X-Git-Tag: v15.1.0~1007^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d98714cde390c9ac350cd6023181d1242eb0ddec;p=ceph.git

ceph-daemon: switch default image

Use this until octopus is ready.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index bc465fcafa2..2ed1238b0b7 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-DEFAULT_IMAGE='ceph/daemon-base'
+DEFAULT_IMAGE='ceph/daemon-base:latest-master'  # FIXME when octopus is ready!!!
 DATA_DIR='/var/lib/ceph'
 LOG_DIR='/var/log/ceph'
 LOGROTATE_DIR='/etc/logrotate.d'
diff --git a/test_ceph_daemon.sh b/test_ceph_daemon.sh
index edece49e682..20af3c2788f 100755
--- a/test_ceph_daemon.sh
+++ b/test_ceph_daemon.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 fsid='00000000-0000-0000-0000-0000deadbeef'
-image='ceph/daemon-base:latest-master-devel'
+image='ceph/daemon-base:latest-master'
 [ -z "$ip" ] && ip=127.0.0.1
 
 #A="-d"