summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTommi Virtanen <tv@inktank.com>2012-08-30 10:16:52 -0400
committerTommi Virtanen <tv@inktank.com>2012-09-05 11:28:04 -0700
commit787a78e8b1d8e5d92ee447b970ec8b79baa46f0b (patch)
tree6b8e34e9dbe89c4c402ae1bf5b0c58b44ac7d794 /debian
parent66aecb1e410a59f3e0ed89a30212b8dc546a3d4a (diff)
downloadceph-787a78e8b1d8e5d92ee447b970ec8b79baa46f0b.tar.gz
upstart, ceph-create-keys: Make client.admin key generation automatic.
This should help simplify Chef etc deployments. Now (when using the Upstart jobs), when a ceph-mon is started, ceph-create-admin-key is triggered. If /etc/ceph/$cluster.client.admin.keyring already exists, it does nothing; otherwise, it waits for ceph-mon to reach quorum, and then does a "ceph auth get-or-create" to create the key, and writes it atomically to disk. The equivalent code can be removed from the Chef cookbook once this is in. Signed-off-by: Tommi Virtanen <tv@inktank.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/ceph.install1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/ceph.install b/debian/ceph.install
index 9674dbc88d6..da097b24c86 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -8,6 +8,7 @@ usr/bin/ceph-osd
usr/bin/ceph-debugpack
sbin/ceph-disk-prepare usr/sbin/
sbin/ceph-disk-activate usr/sbin/
+sbin/ceph-create-keys usr/sbin/
sbin/mkcephfs
usr/lib/ceph/ceph_common.sh
usr/lib/rados-classes/*