diff --git a/defaults/main.yml b/defaults/main.yml index 86bcd8b..fed25e4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -188,7 +188,7 @@ manila_quota_share_networks: 10 # share_driver: manila.share.drivers.lvm.LVMShareDriver # driver_handles_share_servers: False # lvm_share_volume_group: manila_shares -# lvm_share_export_ip: +# lvm_share_export_ips: # manila_backend_lvm_inuse: True if current host has an lvm backend manila_backend_lvm_inuse: "{{ (manila_backends | default('') | to_json).find('lvm') != -1 }}" diff --git a/doc/source/configure-manila.rst b/doc/source/configure-manila.rst index e5cbb91..5c86dae 100644 --- a/doc/source/configure-manila.rst +++ b/doc/source/configure-manila.rst @@ -75,14 +75,14 @@ local NFS server to serve those volumes as shares. driver_handles_share_servers: False -#. Configure the IP address or hostname of the share server. +#. Configure the IP address/es or hostnames of the share server. .. code-block:: yaml - lvm_share_export_ip: "IP_ADDRESS" + lvm_share_export_ips: "IP_ADDRESS" - Replace ``IP_ADDRESS`` with the IP address or hostname where the - nfs shares will be exported from. + Replace ``IP_ADDRESS`` with a comma separated string of one or more IP + addresses or hostnames where the nfs shares will be exported from. The following is a full configuration example of a manila LVM backend named NFS_SHARE1. The manila playbooks will automatically add a custom @@ -100,4 +100,4 @@ named NFS_SHARE1. The manila playbooks will automatically add a custom share_driver: manila.share.drivers.lvm.LVMShareDriver driver_handles_share_servers: False lvm_share_volume_group: manila-shares - lvm_share_export_ip: "172.29.236.100" + lvm_share_export_ips: 172.29.236.100 diff --git a/tests/os_manila-overrides.yml b/tests/os_manila-overrides.yml index 24e0d90..d0f723c 100644 --- a/tests/os_manila-overrides.yml +++ b/tests/os_manila-overrides.yml @@ -90,7 +90,7 @@ manila_backends: share_driver: manila.share.drivers.lvm.LVMShareDriver driver_handles_share_servers: False lvm_share_volume_group: manila-shares - lvm_share_export_ip: "10.1.1.1" + lvm_share_export_ips: "10.1.1.1" filter_function: "share.size >= 0" goodness_function: "share.size >= 0" generic: