Browse Source

Switch to nas_host/nas_share_path options

Use the new config format instead of writing
/etc/cinder/nfs-shares.conf

Change-Id: Icc504027a8d6301e0acf4ebc53edd8d0a89b1baa
Eric Harney 2 years ago
parent
commit
e0e6d0ee67
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      devstack/plugin.sh

+ 2
- 3
devstack/plugin.sh View File

@@ -5,7 +5,6 @@ set +o xtrace
5 5
 
6 6
 NFS_EXPORT_DIR=${NFS_EXPORT_DIR:-/srv/nfs1}
7 7
 STACK_NFS_CONF=${STACK_NFS_CONF:-/etc/exports.d/stack_nfs.exports}
8
-NFS_SHARES_CONF=${NFS_SHARES_CONF:-/etc/cinder/nfs-shares.conf}
9 8
 NFS_SECURE_FILE_PERMISSIONS=${NFS_SECURE_FILE_PERMISSIONS:-False}
10 9
 NFS_SECURE_FILE_OPERATIONS=${NFS_SECURE_FILE_OPERATIONS:-False}
11 10
 
@@ -61,8 +60,8 @@ function is_nfs_enabled_for_service {
61 60
 }
62 61
 
63 62
 function configure_cinder_nfs {
64
-    echo "localhost:${NFS_EXPORT_DIR}" > ${NFS_SHARES_CONF}
65
-    iniset $CINDER_CONF nfs nfs_shares_config ${NFS_SHARES_CONF}
63
+    iniset $CINDER_CONF nfs nas_host localhost
64
+    iniset $CINDER_CONF nfs nas_share_path ${NFS_EXPORT_DIR}
66 65
     iniset $CINDER_CONF nfs nas_secure_file_operations \
67 66
         ${NFS_SECURE_FILE_OPERATIONS}
68 67
     iniset $CINDER_CONF nfs nas_secure_file_permissions \

Loading…
Cancel
Save