From 3527aa786e9adb5600521853ff3115d9a22866ea Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Fri, 19 Apr 2013 11:19:05 -0700 Subject: ceph-create-keys: Don't wait if permission denied If get or create keys returns permssion denied, exit gracefully instead of retrying. Signed-off-by: Gary Lowell Reviewed-by: Sage Weil --- src/ceph-create-keys | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ceph-create-keys b/src/ceph-create-keys index 354e96f48b4..bb3967c0879 100755 --- a/src/ceph-create-keys +++ b/src/ceph-create-keys @@ -79,9 +79,13 @@ def get_key(cluster, mon_id): stdout=f, ) if returncode != 0: - LOG.info('Cannot get or create admin key') - time.sleep(1) - continue + if returncode == errno.EPERM or returncode == errno.EACCES: + LOG.info('Cannot get or create admin key, permission denied') + sys.exit(returncode) + else: + LOG.info('Cannot get or create admin key') + time.sleep(1) + continue os.rename(tmp, path) break @@ -130,9 +134,13 @@ def bootstrap_key(cluster, type_, caps): stdout=f, ) if returncode != 0: - LOG.info('Cannot get or create bootstrap key for %s', type_) - time.sleep(1) - continue + if returncode == errno.EPERM or returncode == errno.EACCES: + LOG.info('Cannot get or create bootstrap key for %s, permission denied', type_) + break + else: + LOG.info('Cannot get or create bootstrap key for %s', type_) + time.sleep(1) + continue os.rename(tmp, path) break -- cgit v1.2.1