openstack/openstack-manuals
Code Issues Proposed changes

Merge "Install Guide: PDF display fixes"

Browse Source
This commit is contained in:
Jenkins 2014-08-03 23:06:43 +00:00 committed by Gerrit Code Review
commit d74779e10f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
<title>Initial networks</title> <title>Initial networks</title>
<mediaobject> <mediaobject>
<imageobject> <imageobject>
<imagedata contentwidth="6in" <imagedata scale="50"
fileref="figures/installguide_neutron-initial-networks.png"/> fileref="figures/installguide_neutron-initial-networks.png"/>
</imageobject> </imageobject>
</mediaobject> </mediaobject>

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

@ -31,7 +31,8 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
<para>Replace <replaceable>NEUTRON_PASS</replaceable> with a suitable <para>Replace <replaceable>NEUTRON_PASS</replaceable> with a suitable
password and <replaceable>neutron@example.com</replaceable> with password and <replaceable>neutron@example.com</replaceable> with
a suitable e-mail address.</para> a suitable e-mail address.</para>
<screen><prompt>$</prompt> <userinput>keystone user-create --name neutron --pass <replaceable>NEUTRON_PASS</replaceable> --email <replaceable>neutron@example.com</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>keystone user-create --name neutron --pass <replaceable>NEUTRON_PASS</replaceable> \
--email <replaceable>neutron@example.com</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Link the <literal>neutron</literal> user to the <para>Link the <literal>neutron</literal> user to the
@ -41,12 +42,14 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
</step> </step>
<step> <step>
<para>Create the <literal>neutron</literal> service:</para> <para>Create the <literal>neutron</literal> service:</para>
<screen><prompt>$</prompt> <userinput>keystone service-create --name neutron --type network --description "OpenStack Networking"</userinput></screen> <screen><prompt>$</prompt> <userinput>keystone service-create --name neutron --type network \
--description "OpenStack Networking"</userinput></screen>
</step> </step>
<step> <step>
<para>Create the service endpoint:</para> <para>Create the service endpoint:</para>
<screen><prompt>$</prompt> <userinput>keystone endpoint-create \ <screen><prompt>$</prompt> <userinput>keystone endpoint-create \
--service-id $(keystone service-list | awk '/ network / {print $2}') \ --service-id \
$(keystone service-list | awk '/ network / {print $2}') \
--publicurl http://<replaceable>controller</replaceable>:9696 \ --publicurl http://<replaceable>controller</replaceable>:9696 \
--adminurl http://<replaceable>controller</replaceable>:9696 \ --adminurl http://<replaceable>controller</replaceable>:9696 \
--internalurl http://<replaceable>controller</replaceable>:9696</userinput></screen> --internalurl http://<replaceable>controller</replaceable>:9696</userinput></screen>

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

@ -24,7 +24,8 @@ net.ipv4.conf.default.rp_filter=0</programlisting>
<procedure> <procedure>
<title>To install the Networking components</title> <title>To install the Networking components</title>
<step> <step>
<screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 neutron-plugin-openvswitch-agent openvswitch-datapath-dkms \ <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 \
neutron-plugin-openvswitch-agent openvswitch-datapath-dkms \
neutron-l3-agent neutron-dhcp-agent</userinput></screen> neutron-l3-agent neutron-dhcp-agent</userinput></screen>
<screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron openstack-neutron-ml2 \ <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron openstack-neutron-ml2 \
openstack-neutron-openvswitch</userinput></screen> openstack-neutron-openvswitch</userinput></screen>