From 9f0a4e74e60e407bc453c493864f6a599164fa07 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 9 Nov 2019 08:01:37 -0600 Subject: [PATCH] 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 --- src/ceph-daemon/ceph-daemon | 2 +- test_ceph_daemon.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon index 63fec9240f5..290bb9a19b9 100755 --- 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 f17793a8b0b..749c30c77da 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' +image='ceph/daemon-base:latest-master-devel' [ -z "$ip" ] && ip=127.0.0.1 CEPH_DAEMON=../src/ceph-daemon/ceph-daemon -- 2.47.3