openstack/openstack-manuals
Code Issues Proposed changes

Fix usage of $/# prompts

Browse Source 
Use # prompt for root and $ for user actions.

Change-Id: Ia241921d4f3d072cf4d7459557a5d78d31d7049c
This commit is contained in:
Andreas Jaeger 2014-03-13 20:35:02 +01:00
parent 25c95b418b
commit bbab391aeb
19 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/common/section_cli_nova_customize_flavors.xml
View File

@ -103,8 +103,8 @@
<para>You can configure the CPU limits with control parameters <para>You can configure the CPU limits with control parameters
with the nova tool. For example, to configure the I/O with the nova tool. For example, to configure the I/O
limit:</para> limit:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key m1.small set quota:read_bytes_sec=10240000</userinput> <screen><prompt>$</prompt> <userinput>nova flavor-key m1.small set quota:read_bytes_sec=10240000</userinput>
<prompt>#</prompt> <userinput>nova flavor-key m1.small set quota:write_bytes_sec=10240000</userinput></screen> <prompt>$</prompt> <userinput>nova flavor-key m1.small set quota:write_bytes_sec=10240000</userinput></screen>
<para>There are CPU control parameters for weight shares, <para>There are CPU control parameters for weight shares,
enforcement intervals for runtime quotas, and a quota for enforcement intervals for runtime quotas, and a quota for
maximum allowed bandwidth.</para> maximum allowed bandwidth.</para>
@ -129,14 +129,14 @@
18446744073709551]</literal> or less than 0. A quota with 18446744073709551]</literal> or less than 0. A quota with
value 0 means no value. You can use this feature to ensure value 0 means no value. You can use this feature to ensure
that all vcpus run at the same speed. For example:</para> that all vcpus run at the same speed. For example:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key m1.low_cpu set quota:cpu_quota=10000</userinput> <screen><prompt>$</prompt> <userinput>nova flavor-key m1.low_cpu set quota:cpu_quota=10000</userinput>
<prompt>#</prompt> <userinput>nova flavor-key m1.low_cpu set quota:cpu_period=20000</userinput></screen> <prompt>$</prompt> <userinput>nova flavor-key m1.low_cpu set quota:cpu_period=20000</userinput></screen>
<para>In this example, the instance of <para>In this example, the instance of
<literal>m1.low_cpu</literal> can only consume a maximum <literal>m1.low_cpu</literal> can only consume a maximum
of 50% CPU of a physical CPU computing capability.</para> of 50% CPU of a physical CPU computing capability.</para>
<para>Through disk I/O quotas, you can set maximum disk write to <para>Through disk I/O quotas, you can set maximum disk write to
10 MB per second for a VM user. For example:</para> 10 MB per second for a VM user. For example:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key m1.medium set disk_write_bytes_sec=10485760</userinput></screen> <screen><prompt>$</prompt> <userinput>nova flavor-key m1.medium set disk_write_bytes_sec=10485760</userinput></screen>
<para>The disk I/O options are:</para> <para>The disk I/O options are:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -197,13 +197,13 @@
to the network.</para> to the network.</para>
<para>This example configures a bandwidth limit for instance <para>This example configures a bandwidth limit for instance
network traffic:</para> network traffic:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key m1.small set quota:inbound_average=10240</userinput> <screen><prompt>$</prompt> <userinput>nova flavor-key m1.small set quota:inbound_average=10240</userinput>
<prompt>#</prompt> <userinput>nova flavor-key m1.small set quota:outbound_average=10240</userinput></screen> <prompt>$</prompt> <userinput>nova flavor-key m1.small set quota:outbound_average=10240</userinput></screen>
<para>Flavors can also be assigned to particular projects. By <para>Flavors can also be assigned to particular projects. By
default, a flavor is public and available to all projects. default, a flavor is public and available to all projects.
Private flavors are only accessible to those on the access Private flavors are only accessible to those on the access
list and are invisible to other projects. To create and assign list and are invisible to other projects. To create and assign
a private flavor to a project, run these commands:</para> a private flavor to a project, run these commands:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-create --is-public false p1.medium auto 512 40 4</userinput> <screen><prompt>$</prompt> <userinput>nova flavor-create --is-public false p1.medium auto 512 40 4</userinput>
<prompt>#</prompt> <userinput>nova flavor-access-add 259d06a0-ba6d-4e60-b42d-ab3144411d58 86f94150ed744e08be565c2ff608eef9</userinput></screen> <prompt>$</prompt> <userinput>nova flavor-access-add 259d06a0-ba6d-4e60-b42d-ab3144411d58 86f94150ed744e08be565c2ff608eef9</userinput></screen>
</section> </section>

2
doc/common/section_cli_nova_host_aggregates.xml
View File

@ -214,7 +214,7 @@
<literal>ssd=true</literal> key-value pair. Setting a <literal>ssd=true</literal> key-value pair. Setting a
key-value pair on a flavor is done using the <command>nova key-value pair on a flavor is done using the <command>nova
flavor-key set_key</command> command.</para> flavor-key set_key</command> command.</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key set_key --name=ssd.large --key=ssd --value=true</userinput></screen> <screen><prompt>$</prompt> <userinput>nova flavor-key set_key --name=ssd.large --key=ssd --value=true</userinput></screen>
<para>Once it is set, you should see the <para>Once it is set, you should see the
<literal>extra_specs</literal> property of the <literal>extra_specs</literal> property of the
<literal>ssd.large</literal> flavor populated with a <literal>ssd.large</literal> flavor populated with a

12
doc/common/section_cli_nova_quotas.xml
View File

@ -252,10 +252,10 @@
</step> </step>
<step> <step>
<para>Update a particular quota value, as follows:</para> <para>Update a particular quota value, as follows:</para>
<screen><prompt>#</prompt> <userinput>nova quota-update --<replaceable>quotaName</replaceable> <replaceable>quotaValue</replaceable> <replaceable>tenantID</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>nova quota-update --<replaceable>quotaName</replaceable> <replaceable>quotaValue</replaceable> <replaceable>tenantID</replaceable></userinput></screen>
<para>For example:</para> <para>For example:</para>
<screen><prompt>#</prompt> <userinput>nova quota-update --floating-ips 20 $tenant <screen><prompt>$</prompt> <userinput>nova quota-update --floating-ips 20 $tenant</userinput>
<prompt>#</prompt> nova quota-show --tenant $tenant</userinput> <prompt>$</prompt> <userinput>nova quota-show --tenant $tenant</userinput>
<computeroutput>+-----------------------------+-------+ <computeroutput>+-----------------------------+-------+
| Quota | Limit | | Quota | Limit |
+-----------------------------+-------+ +-----------------------------+-------+
@ -327,10 +327,10 @@
</step> </step>
<step> <step>
<para>Update a particular quota value, as follows:</para> <para>Update a particular quota value, as follows:</para>
<screen><prompt>#</prompt> <userinput>nova quota-update --user $tenantUser --<replaceable>quotaName</replaceable> <replaceable>quotaValue</replaceable> $tenant</userinput></screen> <screen><prompt>$</prompt> <userinput>nova quota-update --user $tenantUser --<replaceable>quotaName</replaceable> <replaceable>quotaValue</replaceable> $tenant</userinput></screen>
<para>For example:</para> <para>For example:</para>
<screen><prompt>#</prompt> <userinput>nova quota-update --user $tenantUser --floating-ips 12 $tenant <screen><prompt>$</prompt> <userinput>nova quota-update --user $tenantUser --floating-ips 12 $tenant</userinput>
<prompt>#</prompt> nova quota-show --user $tenantUser --tenant $tenant</userinput> <prompt>$</prompt> <userinput>nova quota-show --user $tenantUser --tenant $tenant</userinput>
<computeroutput>+-----------------------------+-------+ <computeroutput>+-----------------------------+-------+
| Quota | Limit | | Quota | Limit |
+-----------------------------+-------+ +-----------------------------+-------+

2
doc/common/section_trusted-compute-pools.xml
View File

@ -150,7 +150,7 @@ auth_blob=i-am-openstack</programlisting>
<para>Use the <command>nova flavor-key set</command> command <para>Use the <command>nova flavor-key set</command> command
to set a flavor as trusted. For example, to set the to set a flavor as trusted. For example, to set the
<literal>m1.tiny</literal> flavor as trusted:</para> <literal>m1.tiny</literal> flavor as trusted:</para>
<screen><prompt>#</prompt> <userinput>nova flavor-key m1.tiny set trust:trusted_host trusted</userinput></screen> <screen><prompt>$</prompt> <userinput>nova flavor-key m1.tiny set trust:trusted_host trusted</userinput></screen>
<para>To request that their instances run on a trusted host, <para>To request that their instances run on a trusted host,
users can specify a trusted flavor on the <command>nova users can specify a trusted flavor on the <command>nova
boot</command> command:</para> boot</command> command:</para>

2
doc/common/section_xen-install.xml
View File

@ -168,7 +168,7 @@
Image Service with Image Service with
<literal>disk-format=iso</literal>, and boot <literal>disk-format=iso</literal>, and boot
them in OpenStack Compute:</para> them in OpenStack Compute:</para>
<screen><prompt>#</prompt> <userinput>glance image-create --name=fedora_iso --disk-format=iso --container-format=bare &lt; Fedora-16-x86_64-netinst.iso</userinput></screen> <screen><prompt>$</prompt> <userinput>glance image-create --name=fedora_iso --disk-format=iso --container-format=bare &lt; Fedora-16-x86_64-netinst.iso</userinput></screen>
</step> </step>
</procedure> </procedure>
</section> </section>

2
doc/config-reference/compute/section_compute-cells.xml
View File

@ -129,7 +129,7 @@ name=<replaceable>cell1</replaceable></programlisting></para>
for the particular cell.</para> for the particular cell.</para>
<para>Use the <command>nova-manage cell create</command> command to add this information to <para>Use the <command>nova-manage cell create</command> command to add this information to
the database in each the database in each
cell:<screen><prompt>$</prompt> <userinput>nova-manage cell create -h</userinput> cell:<screen><prompt>#</prompt> <userinput>nova-manage cell create -h</userinput>
<computeroutput>Options: <computeroutput>Options:
-h, --help show this help message and exit -h, --help show this help message and exit
--name=&lt;name> Name for the new cell --name=&lt;name> Name for the new cell

2
doc/config-reference/compute/section_compute-configure-db.xml
View File

@ -15,7 +15,7 @@
services access the database through the <systemitem services access the database through the <systemitem
class="service">nova-conductor</systemitem> service.</para> class="service">nova-conductor</systemitem> service.</para>
<para>To ensure that the database schema is current, run the following command:</para> <para>To ensure that the database schema is current, run the following command:</para>
<screen><prompt>$</prompt> <userinput>nova-manage db sync</userinput></screen> <screen><prompt>#</prompt> <userinput>nova-manage db sync</userinput></screen>
<para>If <systemitem class="service">nova-conductor</systemitem> <para>If <systemitem class="service">nova-conductor</systemitem>
is not used, entries to the database are mostly written by the is not used, entries to the database are mostly written by the
<systemitem class="service">nova-scheduler</systemitem> <systemitem class="service">nova-scheduler</systemitem>

8
doc/install-guide/object-storage/section_object-storage-install.xml
View File

@ -60,13 +60,13 @@
<literal>swift</literal> user. Use the <literal>swift</literal> user. Use the
<literal>service</literal> tenant and give the user the <literal>service</literal> tenant and give the user the
<literal>admin</literal> role:</para> <literal>admin</literal> role:</para>
<screen><prompt>#</prompt> <userinput>keystone user-create --name=swift --pass=<replaceable>SWIFT_PASS</replaceable> \ <screen><prompt>$</prompt> <userinput>keystone user-create --name=swift --pass=<replaceable>SWIFT_PASS</replaceable> \
--email=<replaceable>swift@example.com</replaceable></userinput> --email=<replaceable>swift@example.com</replaceable></userinput>
<prompt>#</prompt> <userinput>keystone user-role-add --user=swift --tenant=service --role=admin</userinput></screen> <prompt>$</prompt> <userinput>keystone user-role-add --user=swift --tenant=service --role=admin</userinput></screen>
</step> </step>
<step> <step>
<para>Create a service entry for the Object Storage Service:</para> <para>Create a service entry for the Object Storage Service:</para>
<screen><prompt>#</prompt> <userinput>keystone service-create --name=swift --type=object-store \ <screen><prompt>$</prompt> <userinput>keystone service-create --name=swift --type=object-store \
--description="OpenStack Object Storage"</userinput> --description="OpenStack Object Storage"</userinput>
<computeroutput>+-------------+----------------------------------+ <computeroutput>+-------------+----------------------------------+
| Property | Value | | Property | Value |
@ -85,7 +85,7 @@
provide URLs for the public API, internal API, and admin API. provide URLs for the public API, internal API, and admin API.
In this guide, the <literal>controller</literal> host name is In this guide, the <literal>controller</literal> host name is
used:</para> used:</para>
<screen><prompt>#</prompt> <userinput>keystone endpoint-create \ <screen><prompt>$</prompt> <userinput>keystone endpoint-create \
--service-id=$(keystone service-list | awk '/ object-store / {print $2}') \ --service-id=$(keystone service-list | awk '/ object-store / {print $2}') \
--publicurl='http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \ --publicurl='http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \
--internalurl='http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \ --internalurl='http://<replaceable>controller</replaceable>:8080/v1/AUTH_%(tenant_id)s' \

2
doc/install-guide/object-storage/section_start-storage-node-services.xml
View File

@ -22,6 +22,6 @@
<para>To start all swift services at once, run the command:</para> <para>To start all swift services at once, run the command:</para>
<screen><prompt>#</prompt> <userinput>swift-init all start</userinput></screen> <screen><prompt>#</prompt> <userinput>swift-init all start</userinput></screen>
<para>To know more about <literal>swift-init</literal> command, run:</para> <para>To know more about <literal>swift-init</literal> command, run:</para>
<screen><prompt>#</prompt> <userinput>man swift-init</userinput></screen> <screen><prompt>$</prompt> <userinput>man swift-init</userinput></screen>
</note> </note>
</section> </section>

12
doc/install-guide/section_keystone-verify.xml
View File

@ -11,7 +11,7 @@
<envar>OS_SERVICE_TOKEN</envar> and <envar>OS_SERVICE_TOKEN</envar> and
<envar>OS_SERVICE_ENDPOINT</envar> environment <envar>OS_SERVICE_ENDPOINT</envar> environment
variables:</para> variables:</para>
<screen><prompt>#</prompt> <userinput>unset OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT</userinput></screen> <screen><prompt>$</prompt> <userinput>unset OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT</userinput></screen>
<para>These variables, which were used to bootstrap the <para>These variables, which were used to bootstrap the
administrative user and register the Identity Service, are no administrative user and register the Identity Service, are no
longer needed.</para> longer needed.</para>
@ -22,7 +22,7 @@
<para>Request a authentication token by using the <para>Request a authentication token by using the
<literal>admin</literal> user and the password you chose for <literal>admin</literal> user and the password you chose for
that user:</para> that user:</para>
<screen><prompt>#</prompt> <userinput>keystone --os-username=admin --os-password=<replaceable>ADMIN_PASS</replaceable> \ <screen><prompt>$</prompt> <userinput>keystone --os-username=admin --os-password=<replaceable>ADMIN_PASS</replaceable> \
--os-auth-url=http://controller:35357/v2.0 token-get</userinput></screen> --os-auth-url=http://controller:35357/v2.0 token-get</userinput></screen>
<para>In response, you receive a token paired with your user ID. <para>In response, you receive a token paired with your user ID.
This verifies that the Identity Service is running on the This verifies that the Identity Service is running on the
@ -32,7 +32,7 @@
<step> <step>
<para>Verify that authorization behaves as expected. To do so, <para>Verify that authorization behaves as expected. To do so,
request authorization on a tenant:</para> request authorization on a tenant:</para>
<screen><prompt>#</prompt> <userinput>keystone --os-username=admin --os-password=<replaceable>ADMIN_PASS</replaceable> \ <screen><prompt>$</prompt> <userinput>keystone --os-username=admin --os-password=<replaceable>ADMIN_PASS</replaceable> \
--os-tenant-name=admin --os-auth-url=http://controller:35357/v2.0 \ --os-tenant-name=admin --os-auth-url=http://controller:35357/v2.0 \
token-get</userinput></screen> token-get</userinput></screen>
<para>In response, you receive a token that includes the ID of <para>In response, you receive a token that includes the ID of
@ -53,7 +53,7 @@ export OS_AUTH_URL=http://controller:35357/v2.0</programlisting>
<step> <step>
<para>Source this file to read in the environment <para>Source this file to read in the environment
variables:</para> variables:</para>
<screen><prompt>#</prompt> <userinput>source openrc.sh</userinput></screen> <screen><prompt>$</prompt> <userinput>source openrc.sh</userinput></screen>
</step> </step>
<step> <step>
<para>Verify that your <filename>openrc.sh</filename> file is <para>Verify that your <filename>openrc.sh</filename> file is
@ -67,13 +67,13 @@ export OS_AUTH_URL=http://controller:35357/v2.0</programlisting>
<step> <step>
<para>Verify that your admin account has authorization to <para>Verify that your admin account has authorization to
perform administrative commands:</para> perform administrative commands:</para>
<screen><prompt>#</prompt> <userinput>keystone user-list</userinput> <screen><prompt>$</prompt> <userinput>keystone user-list</userinput>
<computeroutput>+----------------------------------+---------+--------------------+--------+ <computeroutput>+----------------------------------+---------+--------------------+--------+
| id | enabled | email | name | | id | enabled | email | name |
+----------------------------------+---------+--------------------+--------+ +----------------------------------+---------+--------------------+--------+
| a4c2d43f80a549a19864c89d759bb3fe | True | admin@example.com | admin | | a4c2d43f80a549a19864c89d759bb3fe | True | admin@example.com | admin |
+----------------------------------+---------+--------------------+--------+</computeroutput></screen> +----------------------------------+---------+--------------------+--------+</computeroutput></screen>
<screen><prompt>#</prompt> <userinput>keystone user-role-list</userinput> <screen><prompt>$</prompt> <userinput>keystone user-role-list</userinput>
<computeroutput>+----------------------------------+----------+----------------------------------+----------------------------------+ <computeroutput>+----------------------------------+----------+----------------------------------+----------------------------------+
| id | name | user_id | tenant_id | | id | name | user_id | tenant_id |
+----------------------------------+----------+----------------------------------+----------------------------------+ +----------------------------------+----------+----------------------------------+----------------------------------+

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

@ -46,14 +46,14 @@ IDENTIFIED BY '<replaceable>NEUTRON_DBPASS</replaceable>';</userinput></screen>
<para>Create the required user, service, and endpoint so that <para>Create the required user, service, and endpoint so that
Networking can interface with the Identity Service.</para> Networking can interface with the Identity Service.</para>
<para>Create a <literal>neutron</literal> user:</para> <para>Create a <literal>neutron</literal> user:</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>
<para>Add the user role to the neutron user:</para> <para>Add the user role to the neutron user:</para>
<screen><prompt>#</prompt> <userinput>keystone user-role-add --user=neutron --tenant=service --role=admin</userinput></screen> <screen><prompt>$</prompt> <userinput>keystone user-role-add --user=neutron --tenant=service --role=admin</userinput></screen>
<para>Create the neutron service:</para> <para>Create the neutron service:</para>
<screen><prompt>#</prompt> <userinput>keystone service-create --name=neutron --type=network \ <screen><prompt>$</prompt> <userinput>keystone service-create --name=neutron --type=network \
--description="OpenStack Networking"</userinput></screen> --description="OpenStack Networking"</userinput></screen>
<para>Create a Networking endpoint:</para> <para>Create a Networking 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 \

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

@ -21,21 +21,21 @@
<literal>ext-net</literal> might be assigned to VMs so that the <literal>ext-net</literal> might be assigned to VMs so that the
external network can contact them. Neutron-based services route the external network can contact them. Neutron-based services route the
traffic appropriately.</para> traffic appropriately.</para>
<screen><prompt>#</prompt> <userinput>neutron net-create ext-net --router:external=True <replaceable>SPECIAL_OPTIONS</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>neutron net-create ext-net --router:external=True <replaceable>SPECIAL_OPTIONS</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Create the associated subnet with the same gateway and <para>Create the associated subnet with the same gateway and
CIDR as <replaceable>EXTERNAL_INTERFACE</replaceable>. It CIDR as <replaceable>EXTERNAL_INTERFACE</replaceable>. It
does not have DHCP because it represents a slice of the does not have DHCP because it represents a slice of the
external world:</para> external world:</para>
<screen><prompt>#</prompt> <userinput>neutron subnet-create ext-net \ <screen><prompt>$</prompt> <userinput>neutron subnet-create ext-net \
--allocation-pool start=<replaceable>FLOATING_IP_START</replaceable>,end=<replaceable>FLOATING_IP_END</replaceable> \ --allocation-pool start=<replaceable>FLOATING_IP_START</replaceable>,end=<replaceable>FLOATING_IP_END</replaceable> \
--gateway=<replaceable>EXTERNAL_INTERFACE_GATEWAY</replaceable> --enable_dhcp=False \ --gateway=<replaceable>EXTERNAL_INTERFACE_GATEWAY</replaceable> --enable_dhcp=False \
<replaceable>EXTERNAL_INTERFACE_CIDR</replaceable></userinput></screen> <replaceable>EXTERNAL_INTERFACE_CIDR</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Create one or more initial tenants, for example:</para> <para>Create one or more initial tenants, for example:</para>
<screen><prompt>#</prompt> <userinput>keystone tenant-create --name <replaceable>DEMO_TENANT</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>keystone tenant-create --name <replaceable>DEMO_TENANT</replaceable></userinput></screen>
<para os="rhel;centos;fedora;opensuse;sles;ubuntu"> See <xref <para os="rhel;centos;fedora;opensuse;sles;ubuntu"> See <xref
linkend="keystone-users"/> for further details.</para> linkend="keystone-users"/> for further details.</para>
<para os="debian"> See <xref linkend="keystone-install"/> for <para os="debian"> See <xref linkend="keystone-install"/> for
@ -50,15 +50,15 @@
command.</para> command.</para>
<para>Use the following to quickly get the <para>Use the following to quickly get the
<replaceable>DEMO_TENANT</replaceable> tenant-id:</para> <replaceable>DEMO_TENANT</replaceable> tenant-id:</para>
<screen><prompt>#</prompt> <userinput>keystone tenant-list | grep <replaceable>DEMO_TENANT</replaceable> | awk '{print $2;}'</userinput></screen> <screen><prompt>$</prompt> <userinput>keystone tenant-list | grep <replaceable>DEMO_TENANT</replaceable> | awk '{print $2;}'</userinput></screen>
<para>Then create the router:</para> <para>Then create the router:</para>
<screen><prompt>#</prompt> <userinput>neutron router-create ext-to-int --tenant-id <replaceable>DEMO_TENANT_ID</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>neutron router-create ext-to-int --tenant-id <replaceable>DEMO_TENANT_ID</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Connect the router to <literal>ext-net</literal> by <para>Connect the router to <literal>ext-net</literal> by
setting the gateway for the router as setting the gateway for the router as
<literal>ext-net</literal>:</para> <literal>ext-net</literal>:</para>
<screen><prompt>#</prompt> <userinput>neutron router-gateway-set <replaceable>EXT_TO_INT_ID</replaceable> <replaceable>EXT_NET_ID</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>neutron router-gateway-set <replaceable>EXT_TO_INT_ID</replaceable> <replaceable>EXT_NET_ID</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Create an internal network for <para>Create an internal network for
@ -66,9 +66,9 @@
subnet over an arbitrary internal IP range, such as, subnet over an arbitrary internal IP range, such as,
<literal>10.5.5.0/24</literal>), and connect it to the <literal>10.5.5.0/24</literal>), and connect it to the
router by setting it as a port:</para> router by setting it as a port:</para>
<screen><prompt>#</prompt> <userinput>neutron net-create --tenant-id <replaceable>DEMO_TENANT_ID</replaceable> demo-net <replaceable>SPECIAL_OPTIONS</replaceable></userinput> <screen><prompt>$</prompt> <userinput>neutron net-create --tenant-id <replaceable>DEMO_TENANT_ID</replaceable> demo-net <replaceable>SPECIAL_OPTIONS</replaceable></userinput>
<prompt>#</prompt> <userinput>neutron subnet-create --tenant-id <replaceable>DEMO_TENANT_ID</replaceable> demo-net 10.5.5.0/24 --gateway 10.5.5.1</userinput> <prompt>$</prompt> <userinput>neutron subnet-create --tenant-id <replaceable>DEMO_TENANT_ID</replaceable> demo-net 10.5.5.0/24 --gateway 10.5.5.1</userinput>
<prompt>#</prompt> <userinput>neutron router-interface-add <replaceable>EXT_TO_INT_ID</replaceable> <replaceable>DEMO_NET_SUBNET_ID</replaceable></userinput></screen> <prompt>$</prompt> <userinput>neutron router-interface-add <replaceable>EXT_TO_INT_ID</replaceable> <replaceable>DEMO_NET_SUBNET_ID</replaceable></userinput></screen>
</step> </step>
</procedure> </procedure>
<section <section

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

@ -413,7 +413,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<step> <step>
<para>Get the tenant ID (Used as $TENANT_ID <para>Get the tenant ID (Used as $TENANT_ID
later):</para> later):</para>
<screen><prompt>#</prompt> <userinput>keystone tenant-list</userinput> <screen><prompt>$</prompt> <userinput>keystone tenant-list</userinput>
<computeroutput>+----------------------------------+---------+---------+ <computeroutput>+----------------------------------+---------+---------+
| id | name | enabled | | id | name | enabled |
+----------------------------------+---------+---------+ +----------------------------------+---------+---------+
@ -426,7 +426,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
</step> </step>
<step> <step>
<para>Get user information:</para> <para>Get user information:</para>
<screen><prompt>#</prompt> <userinput>keystone user-list</userinput> <screen><prompt>$</prompt> <userinput>keystone user-list</userinput>
<computeroutput>+----------------------------------+-------+---------+-------------------+ <computeroutput>+----------------------------------+-------+---------+-------------------+
| id | name | enabled | email | | id | name | enabled | email |
+----------------------------------+-------+---------+-------------------+ +----------------------------------+-------+---------+-------------------+
@ -440,7 +440,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<step> <step>
<para>Create the external network and its subnet by <para>Create the external network and its subnet by
admin user:</para> admin user:</para>
<screen><prompt>#</prompt> <userinput>neutron net-create Ext-Net --provider:network_type local --router:external true</userinput> <screen><prompt>$</prompt> <userinput>neutron net-create Ext-Net --provider:network_type local --router:external true</userinput>
<computeroutput>Created a new network: <computeroutput>Created a new network:
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
| Field | Value | | Field | Value |
@ -458,7 +458,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
| tenant_id | b7445f221cda4f4a8ac7db6b218b1339 | | tenant_id | b7445f221cda4f4a8ac7db6b218b1339 |
+---------------------------+--------------------------------------+</computeroutput></screen> +---------------------------+--------------------------------------+</computeroutput></screen>
<screen><prompt>#</prompt> <userinput>neutron subnet-create Ext-Net 30.0.0.0/24 --disable-dhcp</userinput> <screen><prompt>$</prompt> <userinput>neutron subnet-create Ext-Net 30.0.0.0/24 --disable-dhcp</userinput>
<computeroutput>Created a new subnet: <computeroutput>Created a new subnet:
+------------------+--------------------------------------------+ +------------------+--------------------------------------------+
| Field | Value | | Field | Value |
@ -500,7 +500,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<substeps> <substeps>
<step> <step>
<para>Create a network for TenantA:</para> <para>Create a network for TenantA:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 net-create TenantA-Net</userinput> --os-auth-url=http://localhost:5000/v2.0 net-create TenantA-Net</userinput>
<computeroutput>Created a new network: <computeroutput>Created a new network:
+-----------------+--------------------------------------+ +-----------------+--------------------------------------+
@ -518,7 +518,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<para>After that, you can use admin user to <para>After that, you can use admin user to
query the provider network query the provider network
information:</para> information:</para>
<screen><prompt>#</prompt> <userinput>neutron net-show TenantA-Net</userinput> <screen><prompt>$</prompt> <userinput>neutron net-show TenantA-Net</userinput>
<computeroutput>+---------------------------+--------------------------------------+ <computeroutput>+---------------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
@ -541,7 +541,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<step> <step>
<para>Create a subnet on the network <para>Create a subnet on the network
TenantA-Net:</para> TenantA-Net:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 subnet-create TenantA-Net 10.0.0.0/24</userinput> --os-auth-url=http://localhost:5000/v2.0 subnet-create TenantA-Net 10.0.0.0/24</userinput>
<computeroutput>Created a new subnet: <computeroutput>Created a new subnet:
+------------------+--------------------------------------------+ +------------------+--------------------------------------------+
@ -584,7 +584,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<step> <step>
<para>Create and configure a router for <para>Create and configure a router for
TenantA:</para> TenantA:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 router-create TenantA-R1</userinput> --os-auth-url=http://localhost:5000/v2.0 router-create TenantA-R1</userinput>
<computeroutput>Created a new router: <computeroutput>Created a new router:
+-----------------------+--------------------------------------+ +-----------------------+--------------------------------------+
@ -597,12 +597,12 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
| status | ACTIVE | | status | ACTIVE |
| tenant_id | 247e478c599f45b5bd297e8ddbbc9b6a | | tenant_id | 247e478c599f45b5bd297e8ddbbc9b6a |
+-----------------------+--------------------------------------+</computeroutput></screen> +-----------------------+--------------------------------------+</computeroutput></screen>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 router-interface-add \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \
TenantA-R1 51e2c223-0492-4385-b6e9-83d4e6d10657</userinput></screen> TenantA-R1 51e2c223-0492-4385-b6e9-83d4e6d10657</userinput></screen>
<para>Added interface to router <para>Added interface to router
TenantA-R1</para> TenantA-R1</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 \ --os-auth-url=http://localhost:5000/v2.0 \
router-gateway-set TenantA-R1 Ext-Net</userinput></screen> router-gateway-set TenantA-R1 Ext-Net</userinput></screen>
</step> </step>
@ -614,7 +614,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<step> <step>
<para>Create a floating IP:</para> <para>Create a floating IP:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantA --os-username UserA --os-password password \
--os-auth-url=http://localhost:5000/v2.0 floatingip-create Ext-Net</userinput> --os-auth-url=http://localhost:5000/v2.0 floatingip-create Ext-Net</userinput>
<computeroutput>Created a new floatingip: <computeroutput>Created a new floatingip:
+---------------------+--------------------------------------+ +---------------------+--------------------------------------+
@ -707,21 +707,21 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms
<step> <step>
<para>Create networks and subnets for <para>Create networks and subnets for
TenantC:</para> TenantC:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net1</userinput> --os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net1</userinput>
<prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net1 \ --os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net1 \
10.0.0.0/24 --name TenantC-Subnet1</userinput> 10.0.0.0/24 --name TenantC-Subnet1</userinput>
<prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net2</userinput> --os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net2</userinput>
<prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net2 \ --os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net2 \
10.0.1.0/24 --name TenantC-Subnet2</userinput> 10.0.1.0/24 --name TenantC-Subnet2</userinput>
</screen> </screen>
<para>After that you can use admin user to <para>After that you can use admin user to
query the network's provider network query the network's provider network
information:</para> information:</para>
<screen><prompt>#</prompt> <userinput>neutron net-show TenantC-Net1</userinput> <screen><prompt>$</prompt> <userinput>neutron net-show TenantC-Net1</userinput>
<computeroutput>+---------------------------+--------------------------------------+ <computeroutput>+---------------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
@ -738,7 +738,7 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms
| tenant_id | 2b4fec24e62e4ff28a8445ad83150f9d | | tenant_id | 2b4fec24e62e4ff28a8445ad83150f9d |
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
</computeroutput></screen> </computeroutput></screen>
<screen><prompt>#</prompt> <userinput>neutron net-show TenantC-Net2</userinput> <screen><prompt>$</prompt> <userinput>neutron net-show TenantC-Net2</userinput>
<computeroutput>+---------------------------+--------------------------------------+ <computeroutput>+---------------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
@ -763,20 +763,20 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms
<step> <step>
<para>Create a server TenantC-VM1 for TenantC <para>Create a server TenantC-VM1 for TenantC
on TenantC-Net1.</para> on TenantC-Net1.</para>
<screen><prompt>#</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --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=91309738-c317-40a3-81bb-bed7a3917a85 TenantC_VM1</userinput></screen> --nic net-id=91309738-c317-40a3-81bb-bed7a3917a85 TenantC_VM1</userinput></screen>
</step> </step>
<step> <step>
<para>Create a server TenantC-VM3 for TenantC <para>Create a server TenantC-VM3 for TenantC
on TenantC-Net2.</para> on TenantC-Net2.</para>
<screen><prompt>#</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --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=5b373ad2-7866-44f4-8087-f87148abd623 TenantC_VM3</userinput></screen> --nic net-id=5b373ad2-7866-44f4-8087-f87148abd623 TenantC_VM3</userinput></screen>
</step> </step>
<step> <step>
<para>List servers of TenantC.</para> <para>List servers of TenantC.</para>
<screen><prompt>#</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>nova --os-tenant-name TenantC --os-username UserC --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 |
@ -798,15 +798,15 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms
<step> <step>
<para>Create and configure a router for <para>Create and configure a router for
TenantC:</para> TenantC:</para>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 router-create TenantC-R1</userinput></screen> --os-auth-url=http://localhost:5000/v2.0 router-create TenantC-R1</userinput></screen>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 router-interface-add \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \
TenantC-R1 cf03fd1e-164b-4527-bc87-2b2631634b83</userinput> TenantC-R1 cf03fd1e-164b-4527-bc87-2b2631634b83</userinput>
<prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 router-interface-add \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \
TenantC-R1 38f0b2f0-9f98-4bf6-9520-f4abede03300</userinput></screen> TenantC-R1 38f0b2f0-9f98-4bf6-9520-f4abede03300</userinput></screen>
<screen><prompt>#</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \ <screen><prompt>$</prompt> <userinput>neutron --os-tenant-name TenantC --os-username UserC --os-password password \
--os-auth-url=http://localhost:5000/v2.0 \ --os-auth-url=http://localhost:5000/v2.0 \
router-gateway-set TenantC-R1 Ext-Net</userinput></screen> router-gateway-set TenantC-R1 Ext-Net</userinput></screen>
</step> </step>

40
doc/install-guide/section_neutron-provider-router-with-private_networks.xml
View File

@ -380,7 +380,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<listitem> <listitem>
<para>Export the environment variables in the <para>Export the environment variables in the
<filename>adminrc</filename> file:</para> <filename>adminrc</filename> file:</para>
<screen><prompt>#</prompt> <userinput>source adminrc</userinput></screen> <screen><prompt>$</prompt> <userinput>source adminrc</userinput></screen>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>The <literal>admin</literal> tenant can define resources <para>The <literal>admin</literal> tenant can define resources
@ -396,13 +396,13 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<step> <step>
<para>Get the <literal>tenant_A</literal> tenant <para>Get the <literal>tenant_A</literal> tenant
ID:</para> ID:</para>
<screen><prompt>#</prompt> <userinput>TENANT_ID=$(keystone tenant-list | awk '/ tenant_A / { print $2 }')</userinput></screen> <screen><prompt>$</prompt> <userinput>TENANT_ID=$(keystone tenant-list | awk '/ tenant_A / { print $2 }')</userinput></screen>
</step> </step>
<step> <step>
<para>Create the <literal>net1</literal> internal <para>Create the <literal>net1</literal> internal
network for the <literal>tenant_A</literal> network for the <literal>tenant_A</literal>
tenant:</para> tenant:</para>
<screen><prompt>#</prompt> <userinput>neutron net-create --tenant-id $TENANT_ID net1</userinput> <screen><prompt>$</prompt> <userinput>neutron net-create --tenant-id $TENANT_ID net1</userinput>
<computeroutput>+---------------------------+--------------------------------------+ <computeroutput>+---------------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------------+--------------------------------------+ +---------------------------+--------------------------------------+
@ -422,7 +422,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<step> <step>
<para>Create a subnet on the <literal>net1</literal> <para>Create a subnet on the <literal>net1</literal>
network and store its ID in a variable:</para> network and store its ID in a variable:</para>
<screen><prompt>#</prompt> <userinput>neutron subnet-create --tenant-id $TENANT_ID net1 10.5.5.0/24 \ <screen><prompt>$</prompt> <userinput>neutron subnet-create --tenant-id $TENANT_ID net1 10.5.5.0/24 \
--dns_nameservers list=true 8.8.8.7 8.8.8.8</userinput> --dns_nameservers list=true 8.8.8.7 8.8.8.8</userinput>
<computeroutput>+------------------+--------------------------------------------+ <computeroutput>+------------------+--------------------------------------------+
| Field | Value | | Field | Value |
@ -440,7 +440,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
| network_id | e99a361c-0af8-4163-9feb-8554d4c37e4f | | network_id | e99a361c-0af8-4163-9feb-8554d4c37e4f |
| tenant_id | e40fa60181524f9f9ee7aa1038748f08 | | tenant_id | e40fa60181524f9f9ee7aa1038748f08 |
+------------------+--------------------------------------------+</computeroutput> +------------------+--------------------------------------------+</computeroutput>
<prompt>#</prompt> <userinput>SUBNET_ID=<replaceable>c395cb5d-ba03-41ee-8a12-7e792d51a167</replaceable></userinput></screen> <prompt>$</prompt> <userinput>SUBNET_ID=<replaceable>c395cb5d-ba03-41ee-8a12-7e792d51a167</replaceable></userinput></screen>
<note> <note>
<para>The <literal>id</literal> value will be <para>The <literal>id</literal> value will be
different on your system.</para> different on your system.</para>
@ -457,7 +457,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<para>Create a <literal>router1</literal> router and <para>Create a <literal>router1</literal> router and
store its ID in the <literal>ROUTER_ID</literal> store its ID in the <literal>ROUTER_ID</literal>
variable:</para> variable:</para>
<screen><prompt>#</prompt> <userinput>neutron router-create router1</userinput> <screen><prompt>$</prompt> <userinput>neutron router-create router1</userinput>
<computeroutput>+-----------------------+--------------------------------------+ <computeroutput>+-----------------------+--------------------------------------+
| Field | Value | | Field | Value |
+-----------------------+--------------------------------------+ +-----------------------+--------------------------------------+
@ -468,7 +468,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
| status | ACTIVE | | status | ACTIVE |
| tenant_id | 48fb81ab2f6b409bafac8961a594980f | | tenant_id | 48fb81ab2f6b409bafac8961a594980f |
+-----------------------+--------------------------------------+</computeroutput> +-----------------------+--------------------------------------+</computeroutput>
<prompt>#</prompt> <userinput>ROUTER_ID=<replaceable>685f64e7-a020-4fdf-a8ad-e41194ae124b</replaceable></userinput></screen> <prompt>$</prompt> <userinput>ROUTER_ID=<replaceable>685f64e7-a020-4fdf-a8ad-e41194ae124b</replaceable></userinput></screen>
<note> <note>
<para>The <literal>id</literal> value will be <para>The <literal>id</literal> value will be
different on your system.</para> different on your system.</para>
@ -485,7 +485,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<literal>router1</literal> router and attach <literal>router1</literal> router and attach
it to the subnet from it to the subnet from
<literal>net1</literal>:</para> <literal>net1</literal>:</para>
<screen><prompt>#</prompt> <userinput>neutron router-interface-add $ROUTER_ID $SUBNET_ID</userinput> <screen><prompt>$</prompt> <userinput>neutron router-interface-add $ROUTER_ID $SUBNET_ID</userinput>
<computeroutput>Added interface to router 685f64e7-a020-4fdf-a8ad-e41194ae124b</computeroutput></screen> <computeroutput>Added interface to router 685f64e7-a020-4fdf-a8ad-e41194ae124b</computeroutput></screen>
<note> <note>
<para>You can repeat this step to add interfaces <para>You can repeat this step to add interfaces
@ -498,7 +498,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
network and store its ID in a the network and store its ID in a the
<literal>EXTERNAL_NETWORK_ID</literal> <literal>EXTERNAL_NETWORK_ID</literal>
variable:</para> variable:</para>
<screen><prompt>#</prompt> <userinput>neutron net-create ext_net \ <screen><prompt>$</prompt> <userinput>neutron net-create ext_net \
--router:external=True --provider:network_type=vlan \ --router:external=True --provider:network_type=vlan \
--provider:physical_network=physnet1 --provider:segmentation_id=1</userinput> --provider:physical_network=physnet1 --provider:segmentation_id=1</userinput>
<computeroutput>+---------------------------+--------------------------------------+ <computeroutput>+---------------------------+--------------------------------------+
@ -516,7 +516,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
| subnets | | | subnets | |
| tenant_id | 48fb81ab2f6b409bafac8961a594980f | | tenant_id | 48fb81ab2f6b409bafac8961a594980f |
+---------------------------+--------------------------------------+</computeroutput> +---------------------------+--------------------------------------+</computeroutput>
<prompt>#</prompt> <userinput>EXTERNAL_NETWORK_ID=<replaceable>8858732b-0400-41f6-8e5c-25590e67ffeb</replaceable></userinput></screen> <prompt>$</prompt> <userinput>EXTERNAL_NETWORK_ID=<replaceable>8858732b-0400-41f6-8e5c-25590e67ffeb</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Create the subnet for floating IPs.</para> <para>Create the subnet for floating IPs.</para>
@ -524,7 +524,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<para>The DHCP service is disabled for this <para>The DHCP service is disabled for this
subnet.</para> subnet.</para>
</note> </note>
<screen><prompt>#</prompt> <userinput>neutron subnet-create ext_net \ <screen><prompt>$</prompt> <userinput>neutron subnet-create ext_net \
--allocation-pool start=7.7.7.130,end=7.7.7.150 \ --allocation-pool start=7.7.7.130,end=7.7.7.150 \
--gateway 7.7.7.1 7.7.7.0/24 --disable-dhcp</userinput> --gateway 7.7.7.1 7.7.7.0/24 --disable-dhcp</userinput>
<computeroutput>+------------------+--------------------------------------------------+ <computeroutput>+------------------+--------------------------------------------------+
@ -546,7 +546,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
<step> <step>
<para>Set the gateway for the router to the external <para>Set the gateway for the router to the external
network:</para> network:</para>
<screen><prompt>#</prompt> <userinput>neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID</userinput> <screen><prompt>$</prompt> <userinput>neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID</userinput>
<computeroutput>Set gateway for router 685f64e7-a020-4fdf-a8ad-e41194ae124b</computeroutput></screen> <computeroutput>Set gateway for router 685f64e7-a020-4fdf-a8ad-e41194ae124b</computeroutput></screen>
</step> </step>
</procedure> </procedure>
@ -560,25 +560,25 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
VM after it starts. Store the port ID that was VM after it starts. Store the port ID that was
allocated for the VM in the allocated for the VM in the
<literal>PORT_ID</literal> variable:</para> <literal>PORT_ID</literal> variable:</para>
<screen><prompt>#</prompt> <userinput>nova list</userinput> <screen><prompt>$</prompt> <userinput>nova list</userinput>
<computeroutput>+--------------------------------------+--------+--------+---------------+ <computeroutput>+--------------------------------------+--------+--------+---------------+
| ID | Name | Status | Networks | | ID | Name | Status | Networks |
+--------------------------------------+--------+--------+---------------+ +--------------------------------------+--------+--------+---------------+
| 1cdc671d-a296-4476-9a75-f9ca1d92fd26 | testvm | ACTIVE | net1=10.5.5.3 | | 1cdc671d-a296-4476-9a75-f9ca1d92fd26 | testvm | ACTIVE | net1=10.5.5.3 |
+--------------------------------------+--------+--------+---------------+</computeroutput> +--------------------------------------+--------+--------+---------------+</computeroutput>
<prompt>#</prompt> <userinput>neutron port-list -- --device_id <replaceable>1cdc671d-a296-4476-9a75-f9ca1d92fd26</replaceable></userinput> <prompt>$</prompt> <userinput>neutron port-list -- --device_id <replaceable>1cdc671d-a296-4476-9a75-f9ca1d92fd26</replaceable></userinput>
<computeroutput>+--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+ <computeroutput>+--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+
| id | name | mac_address | fixed_ips | | id | name | mac_address | fixed_ips |
+--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+ +--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+
| 9aa47099-b87b-488c-8c1d-32f993626a30 | | fa:16:3e:b4:d6:6c | {"subnet_id": "c395cb5d-ba03-41ee-8a12-7e792d51a167", "ip_address": "10.5.5.3"} | | 9aa47099-b87b-488c-8c1d-32f993626a30 | | fa:16:3e:b4:d6:6c | {"subnet_id": "c395cb5d-ba03-41ee-8a12-7e792d51a167", "ip_address": "10.5.5.3"} |
+--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+</computeroutput> +--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+</computeroutput>
<prompt>#</prompt> <userinput>PORT_ID=<replaceable>9aa47099-b87b-488c-8c1d-32f993626a30</replaceable></userinput></screen> <prompt>$</prompt> <userinput>PORT_ID=<replaceable>9aa47099-b87b-488c-8c1d-32f993626a30</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Allocate a floating IP and store its ID in the <para>Allocate a floating IP and store its ID in the
<literal>FLOATING_ID</literal> <literal>FLOATING_ID</literal>
variable:</para> variable:</para>
<screen><prompt>#</prompt> <userinput>neutron floatingip-create ext_net</userinput> <screen><prompt>$</prompt> <userinput>neutron floatingip-create ext_net</userinput>
<computeroutput>+---------------------+--------------------------------------+ <computeroutput>+---------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------+--------------------------------------+ +---------------------+--------------------------------------+
@ -590,17 +590,17 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
| router_id | | | router_id | |
| tenant_id | e40fa60181524f9f9ee7aa1038748f08 | | tenant_id | e40fa60181524f9f9ee7aa1038748f08 |
+---------------------+--------------------------------------+</computeroutput> +---------------------+--------------------------------------+</computeroutput>
<prompt>#</prompt> <userinput>FLOATING_ID=<replaceable>7.7.7.131</replaceable></userinput></screen> <prompt>$</prompt> <userinput>FLOATING_ID=<replaceable>7.7.7.131</replaceable></userinput></screen>
</step> </step>
<step> <step>
<para>Associate the floating IP with the port for the <para>Associate the floating IP with the port for the
VM:</para> VM:</para>
<screen><prompt>#</prompt> <userinput>neutron floatingip-associate $FLOATING_ID $PORT_ID</userinput> <screen><prompt>$</prompt> <userinput>neutron floatingip-associate $FLOATING_ID $PORT_ID</userinput>
<computeroutput>Associated floatingip 40952c83-2541-4d0c-b58e-812c835079a5</computeroutput></screen> <computeroutput>Associated floatingip 40952c83-2541-4d0c-b58e-812c835079a5</computeroutput></screen>
</step> </step>
<step> <step>
<para>Show the floating IP:</para> <para>Show the floating IP:</para>
<screen><prompt>#</prompt> <userinput>neutron floatingip-show $FLOATING_ID</userinput> <screen><prompt>$</prompt> <userinput>neutron floatingip-show $FLOATING_ID</userinput>
<computeroutput>+---------------------+--------------------------------------+ <computeroutput>+---------------------+--------------------------------------+
| Field | Value | | Field | Value |
+---------------------+--------------------------------------+ +---------------------+--------------------------------------+
@ -615,7 +615,7 @@ export OS_AUTH_URL="http://<replaceable>controller</replaceable>:5000/v2.0/"</pr
</step> </step>
<step> <step>
<para>Test the floating IP:</para> <para>Test the floating IP:</para>
<screen><prompt>#</prompt> <userinput>ping 7.7.7.131</userinput> <screen><prompt>$</prompt> <userinput>ping 7.7.7.131</userinput>
<computeroutput>PING 7.7.7.131 (7.7.7.131) 56(84) bytes of data. <computeroutput>PING 7.7.7.131 (7.7.7.131) 56(84) bytes of data.
64 bytes from 7.7.7.131: icmp_req=2 ttl=64 time=0.152 ms 64 bytes from 7.7.7.131: icmp_req=2 ttl=64 time=0.152 ms
64 bytes from 7.7.7.131: icmp_req=3 ttl=64 time=0.049 ms</computeroutput></screen> 64 bytes from 7.7.7.131: icmp_req=3 ttl=64 time=0.049 ms</computeroutput></screen>

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

@ -489,7 +489,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
<listitem> <listitem>
<para>Get the tenant ID (Used as $TENANT_ID <para>Get the tenant ID (Used as $TENANT_ID
later):</para> later):</para>
<screen><prompt>#</prompt> <userinput>keystone tenant-list</userinput> <screen><prompt>$</prompt> <userinput>keystone tenant-list</userinput>
<computeroutput>+----------------------------------+---------+---------+ <computeroutput>+----------------------------------+---------+---------+
| id | name | enabled | | id | name | enabled |
+----------------------------------+---------+---------+ +----------------------------------+---------+---------+
@ -502,7 +502,7 @@ export OS_AUTH_URL=http://<replaceable>controller</replaceable>:5000/v2.0/</prog
</listitem> </listitem>
<listitem> <listitem>
<para>Get the user information:</para> <para>Get the user information:</para>
<screen><prompt>#</prompt> <userinput>keystone user-list</userinput> <screen><prompt>$</prompt> <userinput>keystone user-list</userinput>
<computeroutput>+----------------------------------+-------+---------+-------------------+ <computeroutput>+----------------------------------+-------+---------+-------------------+
| id | name | enabled | email | | id | name | enabled | email |
+----------------------------------+-------+---------+-------------------+ +----------------------------------+-------+---------+-------------------+

4
doc/install-guide/section_nova-boot.xml
View File

@ -92,8 +92,8 @@
xlink:href="http://docs.openstack.org/user-guide/content/" xlink:href="http://docs.openstack.org/user-guide/content/"
><citetitle>OpenStack User ><citetitle>OpenStack User
Guide</citetitle></link>.</para> Guide</citetitle></link>.</para>
<screen><prompt>#</prompt> <userinput>nova secgroup-add-rule <replaceable>default</replaceable> tcp 22 22 0.0.0.0/0</userinput></screen> <screen><prompt>$</prompt> <userinput>nova secgroup-add-rule <replaceable>default</replaceable> tcp 22 22 0.0.0.0/0</userinput></screen>
<screen><prompt>#</prompt> <userinput>nova secgroup-add-rule <replaceable>default</replaceable> icmp -1 -1 0.0.0.0/0</userinput></screen> <screen><prompt>$</prompt> <userinput>nova secgroup-add-rule <replaceable>default</replaceable> icmp -1 -1 0.0.0.0/0</userinput></screen>
</step> </step>
<step> <step>
<para>Launch the instance:</para> <para>Launch the instance:</para>

6
doc/install-guide/section_nova-controller.xml
View File

@ -173,9 +173,9 @@ admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
that other OpenStack services can locate it. Register the that other OpenStack services can locate it. Register the
service and specify the endpoint:</para> service and specify the endpoint:</para>
<screen><prompt>#</prompt> <userinput>keystone service-create --name=nova --type=compute \ <screen><prompt>$</prompt> <userinput>keystone service-create --name=nova --type=compute \
--description="OpenStack Compute"</userinput> --description="OpenStack Compute"</userinput>
<prompt>#</prompt> <userinput>keystone endpoint-create \ <prompt>$</prompt> <userinput>keystone endpoint-create \
--service-id=$(keystone service-list | awk '/ compute / {print $2}') \ --service-id=$(keystone service-list | awk '/ compute / {print $2}') \
--publicurl=http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \ --publicurl=http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \
--internalurl=http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \ --internalurl=http://<replaceable>controller</replaceable>:8774/v2/%\(tenant_id\)s \
@ -208,7 +208,7 @@ admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
<step> <step>
<para>To verify your configuration, list available <para>To verify your configuration, list available
images:</para> images:</para>
<screen><prompt>#</prompt> <userinput>nova image-list</userinput> <screen><prompt>$</prompt> <userinput>nova image-list</userinput>
<computeroutput>+--------------------------------------+-----------------+--------+--------+ <computeroutput>+--------------------------------------+-----------------+--------+--------+
| ID | Name | Status | Server | | ID | Name | Status | Server |
+--------------------------------------+-----------------+--------+--------+ +--------------------------------------+-----------------+--------+--------+

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

@ -104,7 +104,7 @@ public_interface=eth1</programlisting>
for the entire installation and not on each compute node. Run the for the entire installation and not on each compute node. Run the
<command>nova network-create</command> command on the <command>nova network-create</command> command on the
controller:</para> controller:</para>
<screen><prompt>#</prompt> <userinput>source openrc.sh</userinput></screen> <screen><prompt>$</prompt> <userinput>source openrc.sh</userinput></screen>
<screen><prompt>#</prompt> <userinput>nova network-create vmnet --fixed-range-v4=10.0.0.0/24 \ <screen><prompt>$</prompt> <userinput>nova network-create vmnet --fixed-range-v4=10.0.0.0/24 \
--bridge=br100 --multi-host=T</userinput></screen> --bridge=br100 --multi-host=T</userinput></screen>
</section> </section>

10
doc/user-guide-admin/section_cli_cinder_quotas.xml
View File

@ -76,9 +76,9 @@
<step> <step>
<para>View Block Storage Service quotas for a project, as <para>View Block Storage Service quotas for a project, as
follows:</para> follows:</para>
<screen><prompt>#</prompt> <userinput>cinder quota-show <replaceable>TENANT_NAME</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>cinder quota-show <replaceable>TENANT_NAME</replaceable></userinput></screen>
<para>For example:</para> <para>For example:</para>
<screen><prompt>#</prompt> <userinput>cinder quota-show tenant01</userinput></screen> <screen><prompt>$</prompt> <userinput>cinder quota-show tenant01</userinput></screen>
<screen><computeroutput>+-----------+-------+ <screen><computeroutput>+-----------+-------+
| Property | Value | | Property | Value |
+-----------+-------+ +-----------+-------+
@ -96,10 +96,10 @@
<step> <step>
<para>Update a particular quota value, as <para>Update a particular quota value, as
follows:</para> follows:</para>
<screen><prompt>#</prompt> <userinput>cinder quota-update --<replaceable>quotaName</replaceable> <replaceable>NewValue</replaceable> <replaceable>tenantID</replaceable></userinput></screen> <screen><prompt>$</prompt> <userinput>cinder quota-update --<replaceable>quotaName</replaceable> <replaceable>NewValue</replaceable> <replaceable>tenantID</replaceable></userinput></screen>
<para>For example:</para> <para>For example:</para>
<screen><prompt>#</prompt> <userinput>cinder quota-update --volumes 15 $tenant</userinput></screen> <screen><prompt>$</prompt> <userinput>cinder quota-update --volumes 15 $tenant</userinput></screen>
<screen><prompt>#</prompt> <userinput>cinder quota-show tenant01</userinput></screen> <screen><prompt>$</prompt> <userinput>cinder quota-show tenant01</userinput></screen>
<screen><computeroutput>+-----------+-------+ <screen><computeroutput>+-----------+-------+
| Property | Value | | Property | Value |
+-----------+-------+ +-----------+-------+