openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fixes two doc bugs with networking install and admin"

Browse Source
This commit is contained in:
Jenkins 2013-12-07 14:05:13 +00:00 committed by Gerrit Code Review
commit 46b41c6905
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1039,9 +1039,9 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal
<procedure> <procedure>
<step> <step>
<para>Install the Open vSwitch plug-in:</para> <para>Install the Open vSwitch plug-in:</para>
<screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-openvswitch-agent</userinput></screen>
<screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install openstack-neutron-openvswitch</userinput></screen> <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install openstack-neutron-openvswitch</userinput></screen>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent</userinput></screen> <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent</userinput></screen>
<!-- TODO(sross): support other distros -->
</step> </step>
<step> <step>
<para>You must set some common configuration options no <para>You must set some common configuration options no

1
www/.htaccess
View File

@ -79,6 +79,7 @@ redirect 301 /trunk/openstack-network/admin/content/ch_adv_features.html /admin-
redirect 301 /trunk/openstack-network/admin/content/under_the_hood_openvswitch.html /havana/config-reference/content/networking-plugin-openvswitch_agent.html redirect 301 /trunk/openstack-network/admin/content/under_the_hood_openvswitch.html /havana/config-reference/content/networking-plugin-openvswitch_agent.html
redirect 301 /trunk/openstack-network/admin/content/under_the_hood_linuxbridge.html /havana/config-reference/content/networking-plugin-linuxbridge_agent.html redirect 301 /trunk/openstack-network/admin/content/under_the_hood_linuxbridge.html /havana/config-reference/content/networking-plugin-linuxbridge_agent.html
redirectmatch /trunk/openstack-network/admin/content/.*$ /admin-guide-cloud/content/ redirectmatch /trunk/openstack-network/admin/content/.*$ /admin-guide-cloud/content/
redirectmatch /openstack/network-admin/admin/content/.*$ /admin-guide-cloud/content/
# Redirect training-manuals project to new location # Redirect training-manuals project to new location
redirect 301 /trunk/openstack-training/ /trunk/training-guides/ redirect 301 /trunk/openstack-training/ /trunk/training-guides/