openstack/openstack-manuals
Code Issues Proposed changes

Edits on Neutron Use-Cases

Browse Source 
Fix [database] sql_connection - it's connection.
Adjust password usage with rest of guide.
Change some prompts for consistency.

Change-Id: If43a27a83927abf8fccc1041d51467aa12c267c4
This commit is contained in:
Andreas Jaeger 2014-01-12 21:36:59 +01:00
parent a961e4db81
commit c24ece1190
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml
View File

@ -136,21 +136,19 @@
Networking user named <emphasis role="bold" Networking user named <emphasis role="bold"
>neutron</emphasis> should be created on tenant >neutron</emphasis> should be created on tenant
<emphasis role="bold">service</emphasis> with <emphasis role="bold">service</emphasis> with
password <emphasis role="bold" password <replaceable
>NEUTRON_PASS</emphasis>.</para> >NEUTRON_PASS</replaceable>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Additional services: <itemizedlist> <para>Additional services: <itemizedlist>
<listitem> <listitem>
<para>RabbitMQ is running with default guest <para>RabbitMQ is running with default guest
and its password.</para> and password <replaceable>RABBIT_PASS</replaceable>.</para>
</listitem> </listitem>
<listitem <listitem
os="rhel;centos;fedora;opensuse;sles;ubuntu"> os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>MySQL server (user is <emphasis <para>MySQL server (user is <emphasis
role="bold">root</emphasis> and role="bold">root</emphasis>).</para>
password is <emphasis role="bold"
>root</emphasis>).</para>
</listitem> </listitem>
</itemizedlist></para> </itemizedlist></para>
</listitem> </listitem>
@ -161,7 +159,7 @@
<title>Install</title> <title>Install</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><emphasis role="bold">Controller node—Networking <para><emphasis role="bold">Controller node - Networking
server</emphasis></para> server</emphasis></para>
<procedure> <procedure>
<step> <step>

16
doc/install-guide/section_neutron-single-flat.xml
View File

@ -122,7 +122,8 @@
<itemizedlist> <itemizedlist>
<listitem os="ubuntu;debian;opensuse;sles"> <listitem os="ubuntu;debian;opensuse;sles">
<para>RabbitMQ is running with the default guest user <para>RabbitMQ is running with the default guest user
and password.</para> and password <replaceable>RABBIT_PASS</replaceable>.
</para>
</listitem> </listitem>
<listitem os="rhel;centos;fedora"> <listitem os="rhel;centos;fedora">
<para>Qpid is running with the default guest user <para>Qpid is running with the default guest user
@ -130,8 +131,7 @@
</listitem> </listitem>
<listitem os="rhel;centos;fedora;opensuse;sles;ubuntu"> <listitem os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>MySQL server (user is <emphasis role="bold" <para>MySQL server (user is <emphasis role="bold"
>root</emphasis> and password is <emphasis >root</emphasis>).</para>
role="bold">root</emphasis>).</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
@ -342,7 +342,7 @@ connection = mysql://neutron:<replaceable>NEUTRON_DBPASS</replaceable>@<replacea
/etc/neutron/neutron.conf</filename> /etc/neutron/neutron.conf</filename>
configuration file to use the plug-in, message queue, configuration file to use the plug-in, message queue,
and database configuration:</para> and database configuration:</para>
<screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DATABASE sql_connection \ <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DATABASE connection \
mysql://neutron:<replaceable>NEUTRON_DBPASS</replaceable>@controller/neutron</userinput></screen> mysql://neutron:<replaceable>NEUTRON_DBPASS</replaceable>@controller/neutron</userinput></screen>
<para>Configure Networking to use your chosen plug-in:</para> <para>Configure Networking to use your chosen plug-in:</para>
<screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \ <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/neutron/neutron.conf DEFAULT \
@ -536,7 +536,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
</listitem> </listitem>
<listitem> <listitem>
<para>Create a subnet on the network:</para> <para>Create a subnet on the network:</para>
<screen><prompt>#</prompt> <userinput>neutron subnet-create --tenant-id $TENANT_ID sharednet1 30.0.0.0/24</userinput> <screen><prompt>$</prompt> <userinput>neutron subnet-create --tenant-id $TENANT_ID sharednet1 30.0.0.0/24</userinput>
<computeroutput>Created a new subnet: <computeroutput>Created a new subnet:
+------------------+--------------------------------------------+ +------------------+--------------------------------------------+
| Field | Value | | Field | Value |
@ -556,10 +556,10 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
</listitem> </listitem>
<listitem> <listitem>
<para>Create a server for tenant A:</para> <para>Create a server for tenant A:</para>
<screen><prompt>#</prompt> <userinput>nova --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>nova --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 boot --image tty --flavor 1 \ --os-auth-url=http://localhost:5000/v2.0 boot --image tty --flavor 1 \
--nic net-id=04457b44-e22a-4a5c-be54-a53a9b2818e7 TenantA_VM1</userinput></screen> --nic net-id=04457b44-e22a-4a5c-be54-a53a9b2818e7 TenantA_VM1</userinput></screen>
<screen><prompt>#</prompt> <userinput>nova --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>nova --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 list</userinput> --os-auth-url=http://localhost:5000/v2.0 list</userinput>
<computeroutput>+--------------------------------------+-------------+--------+---------------------+ <computeroutput>+--------------------------------------+-------------+--------+---------------------+
| ID | Name | Status | Networks | | ID | Name | Status | Networks |
@ -576,7 +576,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<listitem> <listitem>
<para>Ping the public network within the server of <para>Ping the public network within the server of
tenant A:</para> tenant A:</para>
<screen><prompt>#</prompt> <userinput>ping 192.168.1.1</userinput> <screen><prompt>$</prompt> <userinput>ping 192.168.1.1</userinput>
<computeroutput>PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. <computeroutput>PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data.
64 bytes from 192.168.1.1: icmp_req=1 ttl=64 time=1.74 ms 64 bytes from 192.168.1.1: icmp_req=1 ttl=64 time=1.74 ms
64 bytes from 192.168.1.1: icmp_req=2 ttl=64 time=1.50 ms 64 bytes from 192.168.1.1: icmp_req=2 ttl=64 time=1.50 ms