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 bc465fcafa2ed1e51ce5d349ae55f9f5ce07d4a3..2ed1238b0b707be98feec66bbcfe775e2712f877 100755 (executable)
--- 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 edece49e682d2ef2aa597202c75dba12df0ea78c..20af3c2788f80937ed6857885ffb974d114e224b 100755 (executable)
--- 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"