diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-21 17:22:50 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-21 17:22:50 +0000 |
commit | 6fafefd35e30da85fd6881f28dd66ec3b703bdac (patch) | |
tree | d11d5651014a8eb84dfda08b33075bc5691e09d2 /puppet/services/ceph-base.yaml | |
parent | 8ba30a1912979925fa37e210df5ecaab47b07c33 (diff) | |
parent | ad8589212cee744351b9d224265fed9ed1dbf447 (diff) |
Merge "Let mds create manila key and fs"
Diffstat (limited to 'puppet/services/ceph-base.yaml')
-rw-r--r-- | puppet/services/ceph-base.yaml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index ce9f9b9d..f6573f6c 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -11,7 +11,7 @@ parameters: type: string hidden: true CephClientKey: - description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring. + description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. type: string hidden: true CephClientUserName: @@ -61,6 +61,14 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + ManilaCephFSNativeCephFSAuthId: + type: string + default: 'manila' + CephManilaClientKey: + default: '' + description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. + type: string + hidden: true # DEPRECATED options for compatibility with overcloud.yaml # This should be removed and manipulation of the ControllerServices list # used instead, but we need client support for that first @@ -133,6 +141,14 @@ outputs: CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} + MANILA_CLIENT_KEY: + mode: '0644' + secret: {get_param: CephManilaClientKey} + cap_mon: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"' + cap_mds: 'allow *' + cap_osd: 'allow rw' - keys: CEPH_CLIENT_KEY: list_join: ['.', ['client', {get_param: CephClientUserName}]] + MANILA_CLIENT_KEY: + list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]] |