diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-26 09:07:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-26 09:07:49 +0000 |
| commit | 91ad86c8810653218c1777db2f6967dd38c6ca43 (patch) | |
| tree | 34fc05227dad54d70b5ef8ccefbef7ff499cf6b6 /docker | |
| parent | d37036a6e23d8b01284021af60201bc3781abf15 (diff) | |
| parent | 2222355d25ca56b69057d20c9d4d3ccc2750440f (diff) | |
| download | kolla-91ad86c8810653218c1777db2f6967dd38c6ca43.tar.gz kolla-91ad86c8810653218c1777db2f6967dd38c6ca43.zip | |
Merge "Add cap mgr 'allow *' for ceph admin key"6.0.0.0rc1
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 30ffba5fc..8ec53e8b7 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -22,7 +22,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then # Generating initial keyrings and monmap ceph-authtool --create-keyring "${KEYRING_MON}" --gen-key -n mon. --cap mon 'allow *' - ceph-authtool --create-keyring "${KEYRING_ADMIN}" --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' + ceph-authtool --create-keyring "${KEYRING_ADMIN}" --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' --cap mgr 'allow *' ceph-authtool --create-keyring "${KEYRING_RGW}" --gen-key -n client.radosgw.gateway --set-uid=0 --cap osd 'allow rwx' --cap mon 'allow rwx' ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_ADMIN}" ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_RGW}" |