summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2016-08-22 07:54:54 -0700
committerBin Hu <bh526r@att.com>2016-08-22 07:54:54 -0700
commit7c403dfb03fa33b3ea4e9ce40dc09878672c0070 (patch)
tree1154cd253cb52c00b1ee76ddc5df8bd1b080b19b /docs
parent0baecf3999c0f90a57a03298e0ec94a5a746cbda (diff)
Clarified description of disabling security groups
Change-Id: Ieae0250b5b5b8b86f9939c40ee807c3d92e62159 Signed-off-by: Bin Hu <bh526r@att.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/configurationguide/featureconfig.rst12
-rw-r--r--docs/configurationguide/index.rst12
-rw-r--r--docs/userguide/feature.configguide.rst12
3 files changed, 30 insertions, 6 deletions
diff --git a/docs/configurationguide/featureconfig.rst b/docs/configurationguide/featureconfig.rst
index 6d06325..d6f33f5 100644
--- 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
--- 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
--- 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