Clarified description of disabling security groups

Change-Id: Ieae0250b5b5b8b86f9939c40ee807c3d92e62159
Signed-off-by: Bin Hu <bh526r@att.com>

diff --git a/docs/configurationguide/featureconfig.rst b/docs/configurationguide/featureconfig.rst
index 6d06325..d6f33f5 100644 (file)
--- a/docs/configurationguide/featureconfig.rst
+++ b/docs/configurationguide/featureconfig.rst
@@ -155,8 +155,12 @@ configuration and metadata files
 Disable Security Groups in OpenStack ML2 Setup
 ----------------------------------------------
 
+In order to disable Security Groups globally, please make sure that the settings in
+**OPNFV-NATIVE-SEC-1** and **OPNFV-NATIVE-SEC-2** are applied, if they
+are not there by default.
+
 **OPNFV-NATIVE-SEC-1**: Change the settings in
-``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows
+``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows, if they are not there by default
 
 .. code-block:: bash
 
@@ -165,8 +169,12 @@ Disable Security Groups in OpenStack ML2 Setup
     extension_drivers = port_security
     enable_security_group = False
     firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+    [ml2]
+    extension_drivers = port_security
+
 
-**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows
+**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows,
+if they are not there by default.
 
 .. code-block:: bash
 

diff --git a/docs/configurationguide/index.rst b/docs/configurationguide/index.rst
index 67f616f..074f7fc 100644 (file)
--- a/docs/configurationguide/index.rst
+++ b/docs/configurationguide/index.rst
@@ -155,8 +155,12 @@ configuration and metadata files
 Disable Security Groups in OpenStack ML2 Setup
 ----------------------------------------------
 
+In order to disable Security Groups globally, please make sure that the settings in
+**OPNFV-NATIVE-SEC-1** and **OPNFV-NATIVE-SEC-2** are applied, if they
+are not there by default.
+
 **OPNFV-NATIVE-SEC-1**: Change the settings in
-``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows
+``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows, if they are not there by default
 
 .. code-block:: bash
 
@@ -165,8 +169,12 @@ Disable Security Groups in OpenStack ML2 Setup
     extension_drivers = port_security
     enable_security_group = False
     firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+    [ml2]
+    extension_drivers = port_security
+
 
-**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows
+**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows,
+if they are not there by default.
 
 .. code-block:: bash
 

diff --git a/docs/userguide/feature.configguide.rst b/docs/userguide/feature.configguide.rst
index 67f616f..074f7fc 100644 (file)
--- a/docs/userguide/feature.configguide.rst
+++ b/docs/userguide/feature.configguide.rst
@@ -155,8 +155,12 @@ configuration and metadata files
 Disable Security Groups in OpenStack ML2 Setup
 ----------------------------------------------
 
+In order to disable Security Groups globally, please make sure that the settings in
+**OPNFV-NATIVE-SEC-1** and **OPNFV-NATIVE-SEC-2** are applied, if they
+are not there by default.
+
 **OPNFV-NATIVE-SEC-1**: Change the settings in
-``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows
+``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows, if they are not there by default
 
 .. code-block:: bash
 
@@ -165,8 +169,12 @@ Disable Security Groups in OpenStack ML2 Setup
     extension_drivers = port_security
     enable_security_group = False
     firewall_driver = neutron.agent.firewall.NoopFirewallDriver
+    [ml2]
+    extension_drivers = port_security
+
 
-**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows
+**OPNFV-NATIVE-SEC-2**: Change the settings in ``/etc/nova/nova.conf`` as follows,
+if they are not there by default.
 
 .. code-block:: bash