upstart: make id charset include - _ and .

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

diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf
index 4d4de6cdacebeb3912b2dc27de6fcae62de19f17..0724ff89cdef5b6036d18a08637973758c2a30f2 100644 (file)
--- 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 bc3c4d41d8a525a3f222e2a3d02939af012ea9f7..265cb890ce378fb14d85d11ccb3e10d35d1b9e4a 100644 (file)
--- 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 ef7d23a8316e30816b7c8e0a5ca4b6c0577096d3..2044d6a0c6c70b1f396ef4a08707cf3478d261ff 100644 (file)
--- 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%%-*}"