From 42c13079c0a962ddcdb71bcd824564a0a22c1a9d Mon Sep 17 00:00:00 2001 From: zhongjun Date: Sat, 23 Dec 2017 10:55:56 +0800 Subject: [PATCH] Add ipv6 for share network admin doc Added ipv6 config opt in share network admin doc. Change-Id: Ie2f827bf53b97ea4660944544132ed1d1eb4d3db Closes-Bug: #1707005 --- .../admin/shared-file-systems-network-plugins.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/source/admin/shared-file-systems-network-plugins.rst b/doc/source/admin/shared-file-systems-network-plugins.rst index 3c326a5cfc..86058d3f84 100644 --- a/doc/source/admin/shared-file-systems-network-plugins.rst +++ b/doc/source/admin/shared-file-systems-network-plugins.rst @@ -84,3 +84,13 @@ Shared File Systems service: of network - flat and segmented. As above, it is completely up to the share driver to support the network type for which the network plug-in is configured. + +.. note:: + + The ip version of the share network is defined by the flags of + ``network_plugin_ipv4_enabled`` and ``network_plugin_ipv6_enabled`` in the + ``manila.conf`` configuration since Pike. The ``network_plugin_ipv4_enabled`` + default value is set to True. The ``network_plugin_ipv6_enabled`` default value is + set to False. If ``network_plugin_ipv6_enabled`` option is True, the value of + ``network_plugin_ipv4_enabled`` will be ignored, it means to support both IPv4 and + IPv6 share network.