openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fix ambiguity and duplication in network install"

Browse Source
This commit is contained in:
Jenkins 2013-11-29 08:44:57 +00:00 committed by Gerrit Code Review
commit 3417f185fb
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/install-guide/section_nova-network.xml
View File

@ -12,8 +12,7 @@
configured to be highly available by distributing networking
functionality across multiple hosts. As a result, no single
network controller acts as a single point of failure. This
process configures each compute node for networking. You must
complete some minimal configuration on the controller.</para>
process configures each compute node for networking.</para>
<note>
<para>If you need the full software-defined networking stack, see
<xref linkend="ch_neutron"/>.</para>
@ -46,8 +45,7 @@
<screen os="opensuse;sles">
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova.network.api.API</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT security_group_api nova</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf database connection mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@<replaceable>controller</replaceable>/nova</userinput></screen>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput></screen>
<para os="ubuntu;debian">Edit the
<filename>/etc/nova/nova.conf</filename> file and add these
@ -67,14 +65,6 @@ flat_network_bridge=br100
flat_interface=eth1
public_interface=eth1
rabbit_host=<replaceable>controller</replaceable></programlisting>
</step>
<step os="ubuntu;debian">
<para>In the multi-host scenario, you also need to configure the database
access. Edit <filename>/etc/nova/nova.conf</filename> and set the
<code>connection</code> variable in the <literal>[database]</literal>
section.</para>
<programlisting language="ini">[database]
connection = mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@<replaceable>controller</replaceable>/nova</programlisting>
</step>
<step os="fedora;rhel;centos">
<para>Provide a local metadata service that is reachable from