openstack/openstack-manuals
Code Issues Proposed changes

Fix use of securitygroup/firewall_driver

Browse Source 
As reported by Boon Lee, various parts of the documentation were referring
to 'security_group' instead of 'securitygroup'. Additionally, the section
was left out of one command to configure the firewall_driver.

http://docs.openstack.org/trunk/config-reference/content/networking-options-securitygroups.html

Change-Id: I148f6a96064bd6fd31f9f6abaf6985881c337aa9
Closes-Bug: 1302945
This commit is contained in:
Tom Fifield
2014-04-07 20:48:00 +08:00
parent c3d56fb446
commit bb6b30c2cb
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/install-guide/section_neutron-controller-node.xml
View File

@@ -279,7 +279,7 @@ security_group_api=neutron</programlisting>
# Firewall driver for realizing neutron security group function. # Firewall driver for realizing neutron security group function.
firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting> firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
<screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set \ <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set \
/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini security_group \ /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini securitygroup firewall_driver \
neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput></screen> neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput></screen>
</listitem> </listitem>
<listitem> <listitem>

6
doc/install-guide/section_neutron-ml2-compute-node.xml
View File

@@ -219,7 +219,7 @@ allow_overlapping_ips = True</programlisting>
enable_tunneling True</userinput> enable_tunneling True</userinput>
<prompt>#</prompt> <userinput>openstack-config --set/etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \ <prompt>#</prompt> <userinput>openstack-config --set/etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput> firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini security_group \ <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
enable_security_group True</userinput></screen> enable_security_group True</userinput></screen>
</step> </step>
<step os="ubuntu;debian"> <step os="ubuntu;debian">
@@ -255,8 +255,8 @@ enable_tunneling = True</programlisting>
... ...
firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting> firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
<para>Add the following key to the <para>Add the following key to the
<literal>[security_group]</literal> section:</para> <literal>[securitygroup]</literal> section:</para>
<programlisting language="ini">[security_group] <programlisting language="ini">[securitygroup]
... ...
enable_security_group = True</programlisting> enable_security_group = True</programlisting>
</step> </step>

2
doc/install-guide/section_neutron-ml2-controller-node.xml
View File

@@ -341,7 +341,7 @@ allow_overlapping_ips = True</programlisting>
tunnel_id_ranges 1:1000</userinput> tunnel_id_ranges 1:1000</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \ <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput> firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini security_group \ <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
enable_security_group True</userinput></screen> enable_security_group True</userinput></screen>
</step> </step>
<step os="ubuntu;debian"> <step os="ubuntu;debian">

4
doc/install-guide/section_neutron-ml2-network-node.xml
View File

@@ -378,7 +378,7 @@ neutron_metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable
enable_tunneling True</userinput> enable_tunneling True</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \ <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput> firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini security_group \ <prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini securitygroup \
enable_security_group True</userinput></screen> enable_security_group True</userinput></screen>
</step> </step>
<step os="ubuntu;debian"> <step os="ubuntu;debian">
@@ -414,7 +414,7 @@ enable_tunneling = True</programlisting>
... ...
firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting> firewall_driver=neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
<para>Add the following key to the <para>Add the following key to the
<literal>[security_group]</literal> section:</para> <literal>[securitygroup]</literal> section:</para>
<programlisting language="ini">[security_group] <programlisting language="ini">[security_group]
... ...
enable_security_group = True</programlisting> enable_security_group = True</programlisting>