openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Replace hiera lookup for ceph::profile::params::fsid 

We do not deploy Ceph via puppet-ceph so we need to pass to
cinder-volume the RBD secret UUID explicitly

Implements: blueprint remove-puppet-ceph
Change-Id: I8b22917e7436084028ef4fbe7604d28d6a68bee0
This commit is contained in:
Giulio Fidente 2018-05-25 15:26:46 +02:00
parent 8277d675bc
commit a8b7397ac0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/services/cinder-volume.yaml
View File

@ -65,6 +65,9 @@ parameters:
list. This is in addition to the standard RBD backend driver
associated with the CinderRbdPoolName.
type: comma_delimited_list
CephClusterFSID:
type: string
description: The Ceph cluster FSID. Must be a UUID.
CephClusterName:
type: string
default: ceph
@ -151,6 +154,7 @@ outputs:
- '.conf'
tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
tripleo::profile::base::cinder::volume::rbd::cinder_rbd_extra_pools: {get_param: CinderRbdExtraPools}
tripleo::profile::base::cinder::volume::rbd::cinder_rbd_secret_uuid: {get_param: CephClusterFSID}
tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
tripleo.cinder_volume.firewall_rules:
'120 iscsi initiator':