Merge "Fix controller network address"

This commit is contained in:
Jenkins 2014-04-11 19:51:54 +00:00 committed by Gerrit Code Review
commit ccbad50832

View File

@ -80,11 +80,11 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
<para>Set the <option>my_ip</option>, <para>Set the <option>my_ip</option>,
<option>vncserver_listen</option>, and <option>vncserver_listen</option>, and
<option>vncserver_proxyclient_address</option> <option>vncserver_proxyclient_address</option>
configuration options to the internal IP address of the configuration options to the management interface IP address of the
controller node:</para> controller node:</para>
<screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 192.168.0.10</userinput> <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT my_ip 10.0.0.11</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_listen 192.168.0.10</userinput> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_listen 10.0.0.11</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address 192.168.0.10</userinput></screen> <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT vncserver_proxyclient_address 10.0.0.11</userinput></screen>
<para os="ubuntu">Edit the <para os="ubuntu">Edit the
<filename>/etc/nova/nova.conf</filename> file and add these <filename>/etc/nova/nova.conf</filename> file and add these
lines to the <literal>[DEFAULT]</literal> section:</para> lines to the <literal>[DEFAULT]</literal> section:</para>
@ -97,9 +97,9 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
which appear at the end of the file:</para> which appear at the end of the file:</para>
<programlisting os="ubuntu;debian" language="ini">[DEFAULT] <programlisting os="ubuntu;debian" language="ini">[DEFAULT]
... ...
my_ip = 192.168.0.10 my_ip = 10.0.0.11
vncserver_listen = 192.168.0.10 vncserver_listen = 10.0.0.11
vncserver_proxyclient_address = 192.168.0.10</programlisting> vncserver_proxyclient_address = 10.0.0.11</programlisting>
</step> </step>
<step os="fedora;rhel;centos;opensuse;sles"> <step os="fedora;rhel;centos;opensuse;sles">