summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Harney <eharney@redhat.com>2017-04-20 14:42:32 -0400
committerEric Harney <eharney@redhat.com>2017-04-20 14:44:08 -0400
commite0e6d0ee67caeeeeac77e1b5e8942956097da9ad (patch)
treeff8c2ec501649f96a8f3970f6d2562d50def2f8d
parent152c732861e59b0c01bc022eea78662184727425 (diff)
Switch to nas_host/nas_share_path options
Use the new config format instead of writing /etc/cinder/nfs-shares.conf Change-Id: Icc504027a8d6301e0acf4ebc53edd8d0a89b1baa
Notes
Notes (review): Code-Review+2: Eric Harney <eharney@redhat.com> Workflow+1: Eric Harney <eharney@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 24 Apr 2017 17:56:17 +0000 Reviewed-on: https://review.openstack.org/458612 Project: openstack/devstack-plugin-nfs Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 473ead0..cefa934 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -5,7 +5,6 @@ set +o xtrace
5 5
6NFS_EXPORT_DIR=${NFS_EXPORT_DIR:-/srv/nfs1} 6NFS_EXPORT_DIR=${NFS_EXPORT_DIR:-/srv/nfs1}
7STACK_NFS_CONF=${STACK_NFS_CONF:-/etc/exports.d/stack_nfs.exports} 7STACK_NFS_CONF=${STACK_NFS_CONF:-/etc/exports.d/stack_nfs.exports}
8NFS_SHARES_CONF=${NFS_SHARES_CONF:-/etc/cinder/nfs-shares.conf}
9NFS_SECURE_FILE_PERMISSIONS=${NFS_SECURE_FILE_PERMISSIONS:-False} 8NFS_SECURE_FILE_PERMISSIONS=${NFS_SECURE_FILE_PERMISSIONS:-False}
10NFS_SECURE_FILE_OPERATIONS=${NFS_SECURE_FILE_OPERATIONS:-False} 9NFS_SECURE_FILE_OPERATIONS=${NFS_SECURE_FILE_OPERATIONS:-False}
11 10
@@ -61,8 +60,8 @@ function is_nfs_enabled_for_service {
61} 60}
62 61
63function configure_cinder_nfs { 62function configure_cinder_nfs {
64 echo "localhost:${NFS_EXPORT_DIR}" > ${NFS_SHARES_CONF} 63 iniset $CINDER_CONF nfs nas_host localhost
65 iniset $CINDER_CONF nfs nfs_shares_config ${NFS_SHARES_CONF} 64 iniset $CINDER_CONF nfs nas_share_path ${NFS_EXPORT_DIR}
66 iniset $CINDER_CONF nfs nas_secure_file_operations \ 65 iniset $CINDER_CONF nfs nas_secure_file_operations \
67 ${NFS_SECURE_FILE_OPERATIONS} 66 ${NFS_SECURE_FILE_OPERATIONS}
68 iniset $CINDER_CONF nfs nas_secure_file_permissions \ 67 iniset $CINDER_CONF nfs nas_secure_file_permissions \