openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Conform CephExternal template to the new hiera hook"

This commit is contained in:
Jenkins 2017-01-26 18:39:13 +00:00 committed by Gerrit Code Review
parent 47b30fdff5 8bf0468201
commit 98d1795278
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
puppet/services/ceph-external.yaml
View File

@ -89,23 +89,23 @@ outputs:
ceph::profile::params::fsid: {get_param: CephClusterFSID} ceph::profile::params::fsid: {get_param: CephClusterFSID}
ceph::profile::params::rbd_default_features: {get_param: RbdDefaultFeatures} ceph::profile::params::rbd_default_features: {get_param: RbdDefaultFeatures}
ceph::profile::params::client_keys: ceph::profile::params::client_keys:
str_replace: map_replace:
template: "{ - CEPH_CLIENT_KEY:
client.CLIENT_USER: { secret: {get_param: CephClientKey}
secret: 'CLIENT_KEY', mode: '0644'
mode: '0644', cap_mon: 'allow r'
cap_mon: 'allow r', cap_osd:
cap_osd: 'allow class-read object_prefix rbd_children, allow rwx pool=CINDER_POOL, allow rwx pool=CINDERBACKUP_POOL, allow rwx pool=NOVA_POOL, allow rwx pool=GLANCE_POOL, allow rwx pool=GNOCCHI_POOL' str_replace:
} template: 'allow class-read object_prefix rbd_children, allow rwx pool=CINDER_POOL, allow rwx pool=CINDERBACKUP_POOL, allow rwx pool=NOVA_POOL, allow rwx pool=GLANCE_POOL, allow rwx pool=GNOCCHI_POOL'
}" params:
params: NOVA_POOL: {get_param: NovaRbdPoolName}
CLIENT_USER: {get_param: CephClientUserName} CINDER_POOL: {get_param: CinderRbdPoolName}
CLIENT_KEY: {get_param: CephClientKey} CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
NOVA_POOL: {get_param: NovaRbdPoolName} GLANCE_POOL: {get_param: GlanceRbdPoolName}
CINDER_POOL: {get_param: CinderRbdPoolName} GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName} - keys:
GLANCE_POOL: {get_param: GlanceRbdPoolName} CEPH_CLIENT_KEY:
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName} list_join: ['.', ['client', {get_param: CephClientUserName}]]
ceph::profile::params::manage_repo: false ceph::profile::params::manage_repo: false
# FIXME(gfidente): we should not have to list the packages explicitly in # FIXME(gfidente): we should not have to list the packages explicitly in
# the templates, but this should stay until the following is fixed: # the templates, but this should stay until the following is fixed: