RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31463 into master

Browse Source 
* refs/pull/31463/head:
	ceph-daemon: switch default image

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Sage Weil 2019-11-07 07:49:49 -06:00
commit 992499c7bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph-daemon
View File

@ -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'

2
test_ceph_daemon.sh
View File

@ -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"