diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 11:01:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 11:01:13 +0000 |
commit | bb1b80ceb94e87bc3de3a3351acde52a980b4209 (patch) | |
tree | 1e05e0702121bce5f1f36c52bddbe66e81262c83 | |
parent | 1561302e3102d54cf040ae15c5c77471dfa59a59 (diff) | |
parent | 8b7a995df3014d1da312424278dc4753a34f44a6 (diff) |
Merge "Fix usage of CinderNfsServers" into stable/ocata
-rw-r--r-- | puppet/services/cinder-volume.yaml | 6 | ||||
-rw-r--r-- | releasenotes/notes/fix-cinder-nfs-share-usage-0968f88eff7ffb99.yaml | 6 |
2 files changed, 7 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} diff --git a/releasenotes/notes/fix-cinder-nfs-share-usage-0968f88eff7ffb99.yaml b/releasenotes/notes/fix-cinder-nfs-share-usage-0968f88eff7ffb99.yaml new file mode 100644 index 00000000..682171c1 --- /dev/null +++ b/releasenotes/notes/fix-cinder-nfs-share-usage-0968f88eff7ffb99.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - Fixes an issue when using the CinderNfsServers + parameter_defaults setting. It now works using a + single share as well as a comma-separated list of + shares. |