From c24ece119026b21e639c6f85c1eca798488a10c8 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 12 Jan 2014 21:36:59 +0100 Subject: [PATCH] Edits on Neutron Use-Cases Fix [database] sql_connection - it's connection. Adjust password usage with rest of guide. Change some prompts for consistency. Change-Id: If43a27a83927abf8fccc1041d51467aa12c267c4 --- ...-per-tenant-routers-with-private-networks.xml | 12 +++++------- .../section_neutron-single-flat.xml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml index b076a32675..e84527db1f 100644 --- a/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml +++ b/doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml @@ -136,21 +136,19 @@ Networking user named neutron should be created on tenant service with - password NEUTRON_PASS. + password NEUTRON_PASS. Additional services: RabbitMQ is running with default guest - and its password. + and password RABBIT_PASS. MySQL server (user is root and - password is root). + role="bold">root). @@ -161,7 +159,7 @@ Install - Controller node—Networking + Controller node - Networking server diff --git a/doc/install-guide/section_neutron-single-flat.xml b/doc/install-guide/section_neutron-single-flat.xml index b727955343..f9b9f33150 100644 --- a/doc/install-guide/section_neutron-single-flat.xml +++ b/doc/install-guide/section_neutron-single-flat.xml @@ -122,7 +122,8 @@ RabbitMQ is running with the default guest user - and password. + and password RABBIT_PASS. + Qpid is running with the default guest user @@ -130,8 +131,7 @@ MySQL server (user is root and password is root). + >root). @@ -342,7 +342,7 @@ connection = mysql://neutron:NEUTRON_DBPASS@ configuration file to use the plug-in, message queue, and database configuration: - # openstack-config --set /etc/neutron/neutron.conf DATABASE sql_connection \ + # openstack-config --set /etc/neutron/neutron.conf DATABASE connection \ mysql://neutron:NEUTRON_DBPASS@controller/neutron Configure Networking to use your chosen plug-in: # openstack-config --set /etc/neutron/neutron.conf DEFAULT \ @@ -536,7 +536,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create a subnet on the network: - # neutron subnet-create --tenant-id $TENANT_ID sharednet1 30.0.0.0/24 + $ neutron subnet-create --tenant-id $TENANT_ID sharednet1 30.0.0.0/24 Created a new subnet: +------------------+--------------------------------------------+ | Field | Value | @@ -556,10 +556,10 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Create a server for tenant A: - # nova --os-tenant-name TenantA --os-username UserA --os-password password \ + $ nova --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 boot --image tty --flavor 1 \ --nic net-id=04457b44-e22a-4a5c-be54-a53a9b2818e7 TenantA_VM1 - # nova --os-tenant-name TenantA --os-username UserA --os-password password \ + $ nova --os-tenant-name TenantA --os-username UserA --os-password password \ --os-auth-url=http://localhost:5000/v2.0 list +--------------------------------------+-------------+--------+---------------------+ | ID | Name | Status | Networks | @@ -576,7 +576,7 @@ export OS_AUTH_URL=http://controller:5000/v2.0/ Ping the public network within the server of tenant A: - # ping 192.168.1.1 + $ ping 192.168.1.1 PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. 64 bytes from 192.168.1.1: icmp_req=1 ttl=64 time=1.74 ms 64 bytes from 192.168.1.1: icmp_req=2 ttl=64 time=1.50 ms