ceph-daemon: ceph/daemon-base:latest-master-devel

The -devel one rebuilds daily, while latest-master rebuilds when
ceph-container.git changes.

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

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 63fec9240f52b83fecd59a7fdb0860a76215592f..290bb9a19b9d81604852b9732f07dcfb05f56355 100755 (executable)
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-DEFAULT_IMAGE='ceph/daemon-base:latest-master'  # FIXME when octopus is ready!!!
+DEFAULT_IMAGE='ceph/daemon-base:latest-master-devel'  # 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 f17793a8b0b15575f115094a1c538502760b0e41..749c30c77da84e3dcddc85fa0862191b52f481d2 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'
+image='ceph/daemon-base:latest-master-devel'
 [ -z "$ip" ] && ip=127.0.0.1
 
 CEPH_DAEMON=../src/ceph-daemon/ceph-daemon