openstack
/
openstack-manuals
Code Issues Proposed changes

Merge "Install Guide edits"

This commit is contained in:
Jenkins 2014-04-16 02:12:14 +00:00 committed by Gerrit Code Review
parent c6e92290a3 19e604eda2
commit 5aee056419
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/install-guide/section_keystone-services.xml
View File

@ -24,11 +24,11 @@
<step>
<para>Create a service entry for the Identity Service:</para>
<screen><prompt>$</prompt> <userinput>keystone service-create --name=keystone --type=identity \
--description="OpenStack Identity Service"</userinput>
--description="OpenStack Identity"</userinput>
<computeroutput>+-------------+----------------------------------+
| Property | Value |
+-------------+----------------------------------+
| description | OpenStack Identity Service |
| description | OpenStack Identity |
| id | 15c11a23667e427e91bc31335b45f4bd |
| name | keystone |
| type | identity |

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

@ -196,7 +196,10 @@ allow_overlapping_ips = True</programlisting>
<para>Replace
<replaceable>INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS</replaceable>
with the IP address of the instance tunnels network interface on
your compute node.</para>
your compute node. This guide uses
<literal>10.0.1.31</literal> for the IP address of the
instance tunnels network interface on the first compute
node.</para>
<screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \
type_drivers gre</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \

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

@ -317,6 +317,12 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
troubleshooting.</para>
</note>
</step>
<step>
<note>
<para>Perform the next two steps on the
<emphasis>controller</emphasis> node.</para>
</note>
</step>
<step os="rhel;centos;fedora;sles;opensuse">
<para>On the <emphasis>controller</emphasis> node, configure Compute to
use the metadata service:</para>
@ -355,8 +361,11 @@ neutron_metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable
<para>Run the following commands:</para>
<para>Replace
<replaceable>INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS</replaceable>
with the IP address of the instance tunnels network interface on
your network node.</para>
with the IP address of the instance tunnels network interface
on your network node. This guide uses
<literal>10.0.1.21</literal> for the IP address of the
instance tunnels network interface on the network
node.</para>
<screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \
type_drivers gre</userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \