diff options
| author | Gary Lowell <glowell@inktank.com> | 2013-04-19 11:19:05 -0700 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2013-04-21 22:06:37 -0700 |
| commit | 3527aa786e9adb5600521853ff3115d9a22866ea (patch) | |
| tree | 2da8e8984f81c9f1aedf2b78d018ad977c31319d | |
| parent | fe9d3260998e30c9237c2e2d5ba7a0ac6f336966 (diff) | |
| download | ceph-3527aa786e9adb5600521853ff3115d9a22866ea.tar.gz | |
ceph-create-keys: Don't wait if permission deniedwip-4752
If get or create keys returns permssion denied, exit
gracefully instead of retrying.
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
| -rwxr-xr-x | src/ceph-create-keys | 20 |
1 files 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 |