From bbab391aebad27b96e62c954e76ec3f4e4ff644c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 13 Mar 2014 20:35:02 +0100 Subject: [PATCH] Fix usage of $/# prompts Use # prompt for root and $ for user actions. Change-Id: Ia241921d4f3d072cf4d7459557a5d78d31d7049c --- .../section_cli_nova_customize_flavors.xml | 18 +++---- .../section_cli_nova_host_aggregates.xml | 2 +- doc/common/section_cli_nova_quotas.xml | 12 ++--- doc/common/section_trusted-compute-pools.xml | 2 +- doc/common/section_xen-install.xml | 2 +- .../compute/section_compute-cells.xml | 2 +- .../compute/section_compute-configure-db.xml | 2 +- .../section_object-storage-install.xml | 8 ++-- .../section_start-storage-node-services.xml | 2 +- doc/install-guide/section_keystone-verify.xml | 12 ++--- .../section_neutron-controller-node.xml | 8 ++-- .../section_neutron-initial-networks.xml | 18 +++---- ...r-tenant-routers-with-private-networks.xml | 48 +++++++++---------- ...-provider-router-with-private_networks.xml | 40 ++++++++-------- .../section_neutron-single-flat.xml | 4 +- doc/install-guide/section_nova-boot.xml | 4 +- doc/install-guide/section_nova-controller.xml | 6 +-- doc/install-guide/section_nova-network.xml | 4 +- .../section_cli_cinder_quotas.xml | 10 ++-- 19 files changed, 102 insertions(+), 102 deletions(-) diff --git a/doc/common/section_cli_nova_customize_flavors.xml b/doc/common/section_cli_nova_customize_flavors.xml index d53f62dc9e..eee2a9137b 100644 --- a/doc/common/section_cli_nova_customize_flavors.xml +++ b/doc/common/section_cli_nova_customize_flavors.xml @@ -103,8 +103,8 @@ You can configure the CPU limits with control parameters with the nova tool. For example, to configure the I/O limit: - # nova flavor-key m1.small set quota:read_bytes_sec=10240000 -# nova flavor-key m1.small set quota:write_bytes_sec=10240000 + $ nova flavor-key m1.small set quota:read_bytes_sec=10240000 +$ nova flavor-key m1.small set quota:write_bytes_sec=10240000 There are CPU control parameters for weight shares, enforcement intervals for runtime quotas, and a quota for maximum allowed bandwidth. @@ -129,14 +129,14 @@ 18446744073709551] or less than 0. A quota with value 0 means no value. You can use this feature to ensure that all vcpus run at the same speed. For example: - # nova flavor-key m1.low_cpu set quota:cpu_quota=10000 -# nova flavor-key m1.low_cpu set quota:cpu_period=20000 + $ nova flavor-key m1.low_cpu set quota:cpu_quota=10000 +$ nova flavor-key m1.low_cpu set quota:cpu_period=20000 In this example, the instance of m1.low_cpu can only consume a maximum of 50% CPU of a physical CPU computing capability. Through disk I/O quotas, you can set maximum disk write to 10 MB per second for a VM user. For example: - # nova flavor-key m1.medium set disk_write_bytes_sec=10485760 + $ nova flavor-key m1.medium set disk_write_bytes_sec=10485760 The disk I/O options are: @@ -197,13 +197,13 @@ to the network. This example configures a bandwidth limit for instance network traffic: - # nova flavor-key m1.small set quota:inbound_average=10240 -# nova flavor-key m1.small set quota:outbound_average=10240 + $ nova flavor-key m1.small set quota:inbound_average=10240 +$ nova flavor-key m1.small set quota:outbound_average=10240 Flavors can also be assigned to particular projects. By default, a flavor is public and available to all projects. Private flavors are only accessible to those on the access list and are invisible to other projects. To create and assign a private flavor to a project, run these commands: - # nova flavor-create --is-public false p1.medium auto 512 40 4 -# nova flavor-access-add 259d06a0-ba6d-4e60-b42d-ab3144411d58 86f94150ed744e08be565c2ff608eef9 + $ nova flavor-create --is-public false p1.medium auto 512 40 4 +$ nova flavor-access-add 259d06a0-ba6d-4e60-b42d-ab3144411d58 86f94150ed744e08be565c2ff608eef9 diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml index f4c16018bc..d5595d5432 100644 --- a/doc/common/section_cli_nova_host_aggregates.xml +++ b/doc/common/section_cli_nova_host_aggregates.xml @@ -214,7 +214,7 @@ ssd=true key-value pair. Setting a key-value pair on a flavor is done using the nova flavor-key set_key command. - # nova flavor-key set_key --name=ssd.large --key=ssd --value=true + $ nova flavor-key set_key --name=ssd.large --key=ssd --value=true Once it is set, you should see the extra_specs property of the ssd.large flavor populated with a diff --git a/doc/common/section_cli_nova_quotas.xml b/doc/common/section_cli_nova_quotas.xml index 14e2524014..da6c0e2214 100644 --- a/doc/common/section_cli_nova_quotas.xml +++ b/doc/common/section_cli_nova_quotas.xml @@ -252,10 +252,10 @@ Update a particular quota value, as follows: - # nova quota-update --quotaName quotaValue tenantID + $ nova quota-update --quotaName quotaValue tenantID For example: - # nova quota-update --floating-ips 20 $tenant -# nova quota-show --tenant $tenant + $ nova quota-update --floating-ips 20 $tenant +$ nova quota-show --tenant $tenant +-----------------------------+-------+ | Quota | Limit | +-----------------------------+-------+ @@ -327,10 +327,10 @@ Update a particular quota value, as follows: - # nova quota-update --user $tenantUser --quotaName quotaValue $tenant + $ nova quota-update --user $tenantUser --quotaName quotaValue $tenant For example: - # nova quota-update --user $tenantUser --floating-ips 12 $tenant -# nova quota-show --user $tenantUser --tenant $tenant + $ nova quota-update --user $tenantUser --floating-ips 12 $tenant +$ nova quota-show --user $tenantUser --tenant $tenant +-----------------------------+-------+ | Quota | Limit | +-----------------------------+-------+ diff --git a/doc/common/section_trusted-compute-pools.xml b/doc/common/section_trusted-compute-pools.xml index b0110e91c5..bb9cbc7c51 100644 --- a/doc/common/section_trusted-compute-pools.xml +++ b/doc/common/section_trusted-compute-pools.xml @@ -150,7 +150,7 @@ auth_blob=i-am-openstack Use the nova flavor-key set command to set a flavor as trusted. For example, to set the m1.tiny flavor as trusted: - # nova flavor-key m1.tiny set trust:trusted_host trusted + $ nova flavor-key m1.tiny set trust:trusted_host trusted To request that their instances run on a trusted host, users can specify a trusted flavor on the nova boot command: diff --git a/doc/common/section_xen-install.xml b/doc/common/section_xen-install.xml index bbd193984c..62e8151eff 100644 --- a/doc/common/section_xen-install.xml +++ b/doc/common/section_xen-install.xml @@ -168,7 +168,7 @@ Image Service with disk-format=iso, and boot them in OpenStack Compute: - # glance image-create --name=fedora_iso --disk-format=iso --container-format=bare < Fedora-16-x86_64-netinst.iso + $ glance image-create --name=fedora_iso --disk-format=iso --container-format=bare < Fedora-16-x86_64-netinst.iso diff --git a/doc/config-reference/compute/section_compute-cells.xml b/doc/config-reference/compute/section_compute-cells.xml index a9410e3fc6..ee7b2f0645 100644 --- a/doc/config-reference/compute/section_compute-cells.xml +++ b/doc/config-reference/compute/section_compute-cells.xml @@ -129,7 +129,7 @@ name=cell1 for the particular cell. Use the nova-manage cell create command to add this information to the database in each - cell:$ nova-manage cell create -h + cell:# nova-manage cell create -h Options: -h, --help show this help message and exit --name=<name> Name for the new cell diff --git a/doc/config-reference/compute/section_compute-configure-db.xml b/doc/config-reference/compute/section_compute-configure-db.xml index c998a433fc..1d27526ab0 100644 --- a/doc/config-reference/compute/section_compute-configure-db.xml +++ b/doc/config-reference/compute/section_compute-configure-db.xml @@ -15,7 +15,7 @@ services access the database through the nova-conductor service. To ensure that the database schema is current, run the following command: - $ nova-manage db sync + # nova-manage db sync If nova-conductor is not used, entries to the database are mostly written by the nova-scheduler diff --git a/doc/install-guide/object-storage/section_object-storage-install.xml b/doc/install-guide/object-storage/section_object-storage-install.xml index 4d41b7971d..a1d7897cbe 100644 --- a/doc/install-guide/object-storage/section_object-storage-install.xml +++ b/doc/install-guide/object-storage/section_object-storage-install.xml @@ -60,13 +60,13 @@ swift user. Use the service tenant and give the user the admin role: - # keystone user-create --name=swift --pass=SWIFT_PASS \ + $ keystone user-create --name=swift --pass=SWIFT_PASS \ --email=swift@example.com -# keystone user-role-add --user=swift --tenant=service --role=admin +$ keystone user-role-add --user=swift --tenant=service --role=admin Create a service entry for the Object Storage Service: - # keystone service-create --name=swift --type=object-store \ + $ keystone service-create --name=swift --type=object-store \ --description="OpenStack Object Storage" +-------------+----------------------------------+ | Property | Value | @@ -85,7 +85,7 @@ provide URLs for the public API, internal API, and admin API. In this guide, the controller host name is used: - # keystone endpoint-create \ + $ keystone endpoint-create \ --service-id=$(keystone service-list | awk '/ object-store / {print $2}') \ --publicurl='http://controller:8080/v1/AUTH_%(tenant_id)s' \ --internalurl='http://controller:8080/v1/AUTH_%(tenant_id)s' \ diff --git a/doc/install-guide/object-storage/section_start-storage-node-services.xml b/doc/install-guide/object-storage/section_start-storage-node-services.xml index cd16bd6ef7..c7ed906d80 100644 --- a/doc/install-guide/object-storage/section_start-storage-node-services.xml +++ b/doc/install-guide/object-storage/section_start-storage-node-services.xml @@ -22,6 +22,6 @@ To start all swift services at once, run the command: # swift-init all start To know more about swift-init command, run: - # man swift-init + $ man swift-init diff --git a/doc/install-guide/section_keystone-verify.xml b/doc/install-guide/section_keystone-verify.xml index 2c19fb8764..f9be90f628 100644 --- a/doc/install-guide/section_keystone-verify.xml +++ b/doc/install-guide/section_keystone-verify.xml @@ -11,7 +11,7 @@ OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT environment variables: - # unset OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT + $ unset OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT These variables, which were used to bootstrap the administrative user and register the Identity Service, are no longer needed. @@ -22,7 +22,7 @@ Request a authentication token by using the admin user and the password you chose for that user: - # keystone --os-username=admin --os-password=ADMIN_PASS \ + $ keystone --os-username=admin --os-password=ADMIN_PASS \ --os-auth-url=http://controller:35357/v2.0 token-get In response, you receive a token paired with your user ID. This verifies that the Identity Service is running on the @@ -32,7 +32,7 @@ Verify that authorization behaves as expected. To do so, request authorization on a tenant: - # keystone --os-username=admin --os-password=ADMIN_PASS \ + $ keystone --os-username=admin --os-password=ADMIN_PASS \ --os-tenant-name=admin --os-auth-url=http://controller:35357/v2.0 \ token-get In response, you receive a token that includes the ID of @@ -53,7 +53,7 @@ export OS_AUTH_URL=http://controller:35357/v2.0 Source this file to read in the environment variables: - # source openrc.sh + $ source openrc.sh Verify that your openrc.sh file is @@ -67,13 +67,13 @@ export OS_AUTH_URL=http://controller:35357/v2.0 Verify that your admin account has authorization to perform administrative commands: - # keystone user-list + $ keystone user-list +----------------------------------+---------+--------------------+--------+ | id | enabled | email | name | +----------------------------------+---------+--------------------+--------+ | a4c2d43f80a549a19864c89d759bb3fe | True | admin@example.com | admin | +----------------------------------+---------+--------------------+--------+ - # keystone user-role-list + $ keystone user-role-list +----------------------------------+----------+----------------------------------+----------------------------------+ | id | name | user_id | tenant_id | +----------------------------------+----------+----------------------------------+----------------------------------+ diff --git a/doc/install-guide/section_neutron-controller-node.xml b/doc/install-guide/section_neutron-controller-node.xml index 288fddb601..d962fdc751 100644 --- a/doc/install-guide/section_neutron-controller-node.xml +++ b/doc/install-guide/section_neutron-controller-node.xml @@ -46,14 +46,14 @@ IDENTIFIED BY 'NEUTRON_DBPASS'; Create the required user, service, and endpoint so that Networking can interface with the Identity Service. Create a neutron user: - # keystone user-create --name=neutron --pass=NEUTRON_PASS --email=neutron@example.com + $ keystone user-create --name=neutron --pass=NEUTRON_PASS --email=neutron@example.com Add the user role to the neutron user: - # keystone user-role-add --user=neutron --tenant=service --role=admin + $ keystone user-role-add --user=neutron --tenant=service --role=admin Create the neutron service: - # keystone service-create --name=neutron --type=network \ + $ keystone service-create --name=neutron --type=network \ --description="OpenStack Networking" Create a Networking endpoint: - # keystone endpoint-create \ + $ keystone endpoint-create \ --service-id $(keystone service-list | awk '/ network / {print $2}') \ --publicurl http://controller:9696 \ --adminurl http://controller:9696 \ diff --git a/doc/install-guide/section_neutron-initial-networks.xml b/doc/install-guide/section_neutron-initial-networks.xml index 0975169fc2..6f5347b0ca 100644 --- a/doc/install-guide/section_neutron-initial-networks.xml +++ b/doc/install-guide/section_neutron-initial-networks.xml @@ -21,21 +21,21 @@ ext-net might be assigned to VMs so that the external network can contact them. Neutron-based services route the traffic appropriately. - # neutron net-create ext-net --router:external=True SPECIAL_OPTIONS + $ neutron net-create ext-net --router:external=True SPECIAL_OPTIONS Create the associated subnet with the same gateway and CIDR as EXTERNAL_INTERFACE. It does not have DHCP because it represents a slice of the external world: - # neutron subnet-create ext-net \ + $ neutron subnet-create ext-net \ --allocation-pool start=FLOATING_IP_START,end=FLOATING_IP_END \ --gateway=EXTERNAL_INTERFACE_GATEWAY --enable_dhcp=False \ EXTERNAL_INTERFACE_CIDR Create one or more initial tenants, for example: - # keystone tenant-create --name DEMO_TENANT + $ keystone tenant-create --name DEMO_TENANT See for further details. See for @@ -50,15 +50,15 @@ command. Use the following to quickly get the DEMO_TENANT tenant-id: - # keystone tenant-list | grep DEMO_TENANT | awk '{print $2;}' + $ keystone tenant-list | grep DEMO_TENANT | awk '{print $2;}' Then create the router: - # neutron router-create ext-to-int --tenant-id DEMO_TENANT_ID + $ neutron router-create ext-to-int --tenant-id DEMO_TENANT_ID Connect the router to ext-net by setting the gateway for the router as ext-net: - # neutron router-gateway-set EXT_TO_INT_ID EXT_NET_ID + $ neutron router-gateway-set EXT_TO_INT_ID EXT_NET_ID Create an internal network for @@ -66,9 +66,9 @@ subnet over an arbitrary internal IP range, such as, 10.5.5.0/24), and connect it to the router by setting it as a port: - # neutron net-create --tenant-id DEMO_TENANT_ID demo-net SPECIAL_OPTIONS -# neutron subnet-create --tenant-id DEMO_TENANT_ID demo-net 10.5.5.0/24 --gateway 10.5.5.1 -# neutron router-interface-add EXT_TO_INT_ID DEMO_NET_SUBNET_ID + $ neutron net-create --tenant-id DEMO_TENANT_ID demo-net SPECIAL_OPTIONS +$ neutron subnet-create --tenant-id DEMO_TENANT_ID demo-net 10.5.5.0/24 --gateway 10.5.5.1 +$ neutron router-interface-add EXT_TO_INT_ID DEMO_NET_SUBNET_ID
controller:5000/v2.0/ Get the tenant ID (Used as $TENANT_ID later): - # keystone tenant-list + $ keystone tenant-list +----------------------------------+---------+---------+ | id | name | enabled | +----------------------------------+---------+---------+ @@ -426,7 +426,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Get user information: - # keystone user-list + $ keystone user-list +----------------------------------+-------+---------+-------------------+ | id | name | enabled | email | +----------------------------------+-------+---------+-------------------+ @@ -440,7 +440,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create the external network and its subnet by admin user: - # neutron net-create Ext-Net --provider:network_type local --router:external true + $ neutron net-create Ext-Net --provider:network_type local --router:external true Created a new network: +---------------------------+--------------------------------------+ | Field | Value | @@ -458,7 +458,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ - # neutron subnet-create Ext-Net 30.0.0.0/24 --disable-dhcp + $ neutron subnet-create Ext-Net 30.0.0.0/24 --disable-dhcp Created a new subnet: +------------------+--------------------------------------------+ | Field | Value | @@ -500,7 +500,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create a network for TenantA: - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ neutron --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 net-create TenantA-Net Created a new network: +-----------------+--------------------------------------+ @@ -518,7 +518,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/After that, you can use admin user to query the provider network information: - # neutron net-show TenantA-Net + $ neutron net-show TenantA-Net +---------------------------+--------------------------------------+ | Field | Value | +---------------------------+--------------------------------------+ @@ -541,7 +541,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create a subnet on the network TenantA-Net: - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ 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 Created a new subnet: +------------------+--------------------------------------------+ @@ -584,7 +584,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create and configure a router for TenantA: - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ neutron --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 router-create TenantA-R1 Created a new router: +-----------------------+--------------------------------------+ @@ -597,12 +597,12 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ neutron --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \ TenantA-R1 51e2c223-0492-4385-b6e9-83d4e6d10657 Added interface to router TenantA-R1 - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ neutron --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 \ router-gateway-set TenantA-R1 Ext-Net @@ -614,7 +614,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create a floating IP: - # neutron --os-tenant-name TenantA --os-username UserA --os-password password \ + $ neutron --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 floatingip-create Ext-Net Created a new floatingip: +---------------------+--------------------------------------+ @@ -707,21 +707,21 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms Create networks and subnets for TenantC: - # neutron --os-tenant-name TenantC --os-username UserC --os-password password \ + $ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net1 -# neutron --os-tenant-name TenantC --os-username UserC --os-password password \ +$ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net1 \ 10.0.0.0/24 --name TenantC-Subnet1 -# neutron --os-tenant-name TenantC --os-username UserC --os-password password \ +$ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 net-create TenantC-Net2 -# neutron --os-tenant-name TenantC --os-username UserC --os-password password \ +$ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 subnet-create TenantC-Net2 \ 10.0.1.0/24 --name TenantC-Subnet2 After that you can use admin user to query the network's provider network information: - # neutron net-show TenantC-Net1 + $ neutron net-show TenantC-Net1 +---------------------------+--------------------------------------+ | Field | Value | +---------------------------+--------------------------------------+ @@ -738,7 +738,7 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms | tenant_id | 2b4fec24e62e4ff28a8445ad83150f9d | +---------------------------+--------------------------------------+ - # neutron net-show TenantC-Net2 + $ neutron net-show TenantC-Net2 +---------------------------+--------------------------------------+ | Field | Value | +---------------------------+--------------------------------------+ @@ -763,20 +763,20 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms Create a server TenantC-VM1 for TenantC on TenantC-Net1. - # nova --os-tenant-name TenantC --os-username UserC --os-password password \ + $ nova --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 boot --image tty --flavor 1 \ --nic net-id=91309738-c317-40a3-81bb-bed7a3917a85 TenantC_VM1 Create a server TenantC-VM3 for TenantC on TenantC-Net2. - # nova --os-tenant-name TenantC --os-username UserC --os-password password \ + $ nova --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 boot --image tty --flavor 1 \ --nic net-id=5b373ad2-7866-44f4-8087-f87148abd623 TenantC_VM3 List servers of TenantC. - # nova --os-tenant-name TenantC --os-username UserC --os-password password \ + $ nova --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 list +--------------------------------------+-------------+--------+-----------------------+ | ID | Name | Status | Networks | @@ -798,15 +798,15 @@ rtt min/avg/max/mdev = 0.898/15.621/45.027/20.793 ms Create and configure a router for TenantC: - # neutron --os-tenant-name TenantC --os-username UserC --os-password password \ + $ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 router-create TenantC-R1 - # neutron --os-tenant-name TenantC --os-username UserC --os-password password \ + $ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \ TenantC-R1 cf03fd1e-164b-4527-bc87-2b2631634b83 -# neutron --os-tenant-name TenantC --os-username UserC --os-password password \ +$ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 router-interface-add \ TenantC-R1 38f0b2f0-9f98-4bf6-9520-f4abede03300 - # neutron --os-tenant-name TenantC --os-username UserC --os-password password \ + $ neutron --os-tenant-name TenantC --os-username UserC --os-password password \ --os-auth-url=http://localhost:5000/v2.0 \ router-gateway-set TenantC-R1 Ext-Net diff --git a/doc/install-guide/section_neutron-provider-router-with-private_networks.xml b/doc/install-guide/section_neutron-provider-router-with-private_networks.xml index 8dead7b21e..c6dfea41fb 100644 --- a/doc/install-guide/section_neutron-provider-router-with-private_networks.xml +++ b/doc/install-guide/section_neutron-provider-router-with-private_networks.xml @@ -380,7 +380,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" Export the environment variables in the adminrc file: - # source adminrc + $ source adminrc The admin tenant can define resources @@ -396,13 +396,13 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" Get the tenant_A tenant ID: - # TENANT_ID=$(keystone tenant-list | awk '/ tenant_A / { print $2 }') + $ TENANT_ID=$(keystone tenant-list | awk '/ tenant_A / { print $2 }') Create the net1 internal network for the tenant_A tenant: - # neutron net-create --tenant-id $TENANT_ID net1 + $ neutron net-create --tenant-id $TENANT_ID net1 +---------------------------+--------------------------------------+ | Field | Value | +---------------------------+--------------------------------------+ @@ -422,7 +422,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" Create a subnet on the net1 network and store its ID in a variable: - # neutron subnet-create --tenant-id $TENANT_ID net1 10.5.5.0/24 \ + $ 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 +------------------+--------------------------------------------+ | Field | Value | @@ -440,7 +440,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" -# SUBNET_ID=c395cb5d-ba03-41ee-8a12-7e792d51a167 +$ SUBNET_ID=c395cb5d-ba03-41ee-8a12-7e792d51a167 The id value will be different on your system. @@ -457,7 +457,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/"Create a router1 router and store its ID in the ROUTER_ID variable: - # neutron router-create router1 + $ neutron router-create router1 +-----------------------+--------------------------------------+ | Field | Value | +-----------------------+--------------------------------------+ @@ -468,7 +468,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" -# ROUTER_ID=685f64e7-a020-4fdf-a8ad-e41194ae124b +$ ROUTER_ID=685f64e7-a020-4fdf-a8ad-e41194ae124b The id value will be different on your system. @@ -485,7 +485,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/"router1 router and attach it to the subnet from net1: - # neutron router-interface-add $ROUTER_ID $SUBNET_ID + $ neutron router-interface-add $ROUTER_ID $SUBNET_ID Added interface to router 685f64e7-a020-4fdf-a8ad-e41194ae124b You can repeat this step to add interfaces @@ -498,7 +498,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/"EXTERNAL_NETWORK_ID variable: - # neutron net-create ext_net \ + $ neutron net-create ext_net \ --router:external=True --provider:network_type=vlan \ --provider:physical_network=physnet1 --provider:segmentation_id=1 +---------------------------+--------------------------------------+ @@ -516,7 +516,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" -# EXTERNAL_NETWORK_ID=8858732b-0400-41f6-8e5c-25590e67ffeb +$ EXTERNAL_NETWORK_ID=8858732b-0400-41f6-8e5c-25590e67ffeb Create the subnet for floating IPs. @@ -524,7 +524,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/"The DHCP service is disabled for this subnet. - # neutron subnet-create ext_net \ + $ neutron subnet-create ext_net \ --allocation-pool start=7.7.7.130,end=7.7.7.150 \ --gateway 7.7.7.1 7.7.7.0/24 --disable-dhcp +------------------+--------------------------------------------------+ @@ -546,7 +546,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" Set the gateway for the router to the external network: - # neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID + $ neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID Set gateway for router 685f64e7-a020-4fdf-a8ad-e41194ae124b @@ -560,25 +560,25 @@ export OS_AUTH_URL="http://controller:5000/v2.0/"PORT_ID variable: - # nova list + $ nova list +--------------------------------------+--------+--------+---------------+ | ID | Name | Status | Networks | +--------------------------------------+--------+--------+---------------+ | 1cdc671d-a296-4476-9a75-f9ca1d92fd26 | testvm | ACTIVE | net1=10.5.5.3 | +--------------------------------------+--------+--------+---------------+ -# neutron port-list -- --device_id 1cdc671d-a296-4476-9a75-f9ca1d92fd26 +$ neutron port-list -- --device_id 1cdc671d-a296-4476-9a75-f9ca1d92fd26 +--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+ | 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"} | +--------------------------------------+------+-------------------+---------------------------------------------------------------------------------+ -# PORT_ID=9aa47099-b87b-488c-8c1d-32f993626a30 +$ PORT_ID=9aa47099-b87b-488c-8c1d-32f993626a30 Allocate a floating IP and store its ID in the FLOATING_ID variable: - # neutron floatingip-create ext_net + $ neutron floatingip-create ext_net +---------------------+--------------------------------------+ | Field | Value | +---------------------+--------------------------------------+ @@ -590,17 +590,17 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" -# FLOATING_ID=7.7.7.131 +$ FLOATING_ID=7.7.7.131 Associate the floating IP with the port for the VM: - # neutron floatingip-associate $FLOATING_ID $PORT_ID + $ neutron floatingip-associate $FLOATING_ID $PORT_ID Associated floatingip 40952c83-2541-4d0c-b58e-812c835079a5 Show the floating IP: - # neutron floatingip-show $FLOATING_ID + $ neutron floatingip-show $FLOATING_ID +---------------------+--------------------------------------+ | Field | Value | +---------------------+--------------------------------------+ @@ -615,7 +615,7 @@ export OS_AUTH_URL="http://controller:5000/v2.0/" Test the floating IP: - # ping 7.7.7.131 + $ ping 7.7.7.131 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=3 ttl=64 time=0.049 ms diff --git a/doc/install-guide/section_neutron-single-flat.xml b/doc/install-guide/section_neutron-single-flat.xml index e03be49efd..106ed3ca18 100644 --- a/doc/install-guide/section_neutron-single-flat.xml +++ b/doc/install-guide/section_neutron-single-flat.xml @@ -489,7 +489,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Get the tenant ID (Used as $TENANT_ID later): - # keystone tenant-list + $ keystone tenant-list +----------------------------------+---------+---------+ | id | name | enabled | +----------------------------------+---------+---------+ @@ -502,7 +502,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Get the user information: - # keystone user-list + $ keystone user-list +----------------------------------+-------+---------+-------------------+ | id | name | enabled | email | +----------------------------------+-------+---------+-------------------+ diff --git a/doc/install-guide/section_nova-boot.xml b/doc/install-guide/section_nova-boot.xml index 96191e00e4..e54c884c16 100644 --- a/doc/install-guide/section_nova-boot.xml +++ b/doc/install-guide/section_nova-boot.xml @@ -92,8 +92,8 @@ xlink:href="http://docs.openstack.org/user-guide/content/" >OpenStack User Guide. - # nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 - # nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 + $ nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 + $ nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 Launch the instance: diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml index c545348367..6081cd0bd6 100644 --- a/doc/install-guide/section_nova-controller.xml +++ b/doc/install-guide/section_nova-controller.xml @@ -173,9 +173,9 @@ admin_password = NOVA_PASS that other OpenStack services can locate it. Register the service and specify the endpoint: - # keystone service-create --name=nova --type=compute \ + $ keystone service-create --name=nova --type=compute \ --description="OpenStack Compute" -# keystone endpoint-create \ +$ keystone endpoint-create \ --service-id=$(keystone service-list | awk '/ compute / {print $2}') \ --publicurl=http://controller:8774/v2/%\(tenant_id\)s \ --internalurl=http://controller:8774/v2/%\(tenant_id\)s \ @@ -208,7 +208,7 @@ admin_password = NOVA_PASS To verify your configuration, list available images: - # nova image-list + $ nova image-list +--------------------------------------+-----------------+--------+--------+ | ID | Name | Status | Server | +--------------------------------------+-----------------+--------+--------+ diff --git a/doc/install-guide/section_nova-network.xml b/doc/install-guide/section_nova-network.xml index 0771d9a849..5a2959173e 100644 --- a/doc/install-guide/section_nova-network.xml +++ b/doc/install-guide/section_nova-network.xml @@ -104,7 +104,7 @@ public_interface=eth1 for the entire installation and not on each compute node. Run the nova network-create command on the controller: - # source openrc.sh - # nova network-create vmnet --fixed-range-v4=10.0.0.0/24 \ + $ source openrc.sh + $ nova network-create vmnet --fixed-range-v4=10.0.0.0/24 \ --bridge=br100 --multi-host=T
diff --git a/doc/user-guide-admin/section_cli_cinder_quotas.xml b/doc/user-guide-admin/section_cli_cinder_quotas.xml index 9e3b680fc7..e44174a78a 100644 --- a/doc/user-guide-admin/section_cli_cinder_quotas.xml +++ b/doc/user-guide-admin/section_cli_cinder_quotas.xml @@ -76,9 +76,9 @@ View Block Storage Service quotas for a project, as follows: - # cinder quota-show TENANT_NAME + $ cinder quota-show TENANT_NAME For example: - # cinder quota-show tenant01 + $ cinder quota-show tenant01 +-----------+-------+ | Property | Value | +-----------+-------+ @@ -96,10 +96,10 @@ Update a particular quota value, as follows: - # cinder quota-update --quotaName NewValue tenantID + $ cinder quota-update --quotaName NewValue tenantID For example: - # cinder quota-update --volumes 15 $tenant - # cinder quota-show tenant01 + $ cinder quota-update --volumes 15 $tenant + $ cinder quota-show tenant01 +-----------+-------+ | Property | Value | +-----------+-------+