From 6f30f1fcdecd6c9390d4678c754dadd305165e3e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 14 Jun 2012 15:04:07 -0700 Subject: [PATCH] upstart: make id charset include - _ and . Signed-off-by: Sage Weil --- src/upstart/ceph-mds-all-starter.conf | 2 +- src/upstart/ceph-mon-all-starter.conf | 2 +- src/upstart/radosgw-all-starter.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf index 4d4de6cdacebe..0724ff89cdef5 100644 --- a/src/upstart/ceph-mds-all-starter.conf +++ b/src/upstart/ceph-mds-all-starter.conf @@ -7,7 +7,7 @@ task script set -e # TODO what's the valid charset for cluster names and mds ids? - find /var/lib/ceph/mds/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9]+' -printf '%P\n' \ + find /var/lib/ceph/mds/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9\.\-\_]+' -printf '%P\n' \ | while read f; do if [ -e "/var/lib/ceph/mds/$f/done" ]; then cluster="${f%%-*}" diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf index bc3c4d41d8a52..265cb890ce378 100644 --- a/src/upstart/ceph-mon-all-starter.conf +++ b/src/upstart/ceph-mon-all-starter.conf @@ -7,7 +7,7 @@ task script set -e # TODO what's the valid charset for cluster names and mon ids? - find /var/lib/ceph/mon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9]+' -printf '%P\n' \ + find /var/lib/ceph/mon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9\.\-\_]+' -printf '%P\n' \ | while read f; do if [ -e "/var/lib/ceph/mon/$f/done" ]; then cluster="${f%%-*}" diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf index ef7d23a8316e3..2044d6a0c6c70 100644 --- a/src/upstart/radosgw-all-starter.conf +++ b/src/upstart/radosgw-all-starter.conf @@ -7,7 +7,7 @@ task script set -e # TODO what's the valid charset for cluster names and daemon ids? - find /var/lib/ceph/radosgw/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9]+' -printf '%P\n' \ + find /var/lib/ceph/radosgw/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9\.\-\_]+' -printf '%P\n' \ | while read f; do if [ -e "/var/lib/ceph/radosgw/$f/done" ]; then cluster="${f%%-*}" -- 2.39.5