summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-25 17:22:01 +0000
committerGerrit Code Review <review@openstack.org>2017-03-25 17:22:01 +0000
commit98dbd32f6ecb7d7a5a2a46d4578857b27b0a8c9c (patch)
tree05cfa84735aea9b23437a455ff9cdd4354eb6ed7 /puppet/services
parentc851bf6a83cbf4f3357b7db7b4c039d881572052 (diff)
parent9445b0e0972696e7de1c0a702f456571d12fa964 (diff)
Merge "Fix usage of CinderNfsServers"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/cinder-volume.yaml6
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index b52955ef..26f1a96f 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -94,11 +94,7 @@ outputs:
tripleo::profile::base::cinder::volume::cinder_enable_nfs_backend: {get_param: CinderEnableNfsBackend}
tripleo::profile::base::cinder::volume::cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
tripleo::profile::base::cinder::volume::nfs::cinder_nfs_mount_options: {get_param: CinderNfsMountOptions}
- tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers:
- str_replace:
- template: SERVERS
- params:
- SERVERS: {get_param: CinderNfsServers}
+ tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers: {get_param: CinderNfsServers}
tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize}
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper}
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_protocol: {get_param: CinderISCSIProtocol}