From 4ca6211269fa4165da5a18a8f67bd32d32c4c04e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 7 Dec 2013 15:20:58 +0100 Subject: [PATCH] Install Guides: Edits based on Anne's comments Revert and fix some changes as commented on in: https://review.openstack.org/#/c/60493 Change-Id: Id6355a84bdfeed43a4d2b9657df8745cbc80c632 backport: havana --- doc/install-guide/ch_swift.xml | 2 +- doc/install-guide/section_ceilometer-nova.xml | 4 ++-- .../section_dashboard-install.xml | 2 +- .../section_keystone-install.xml | 4 ++-- doc/install-guide/section_keystone-users.xml | 23 ++++++++++--------- doc/install-guide/section_nova-network.xml | 8 +++---- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/install-guide/ch_swift.xml b/doc/install-guide/ch_swift.xml index 7a1d69ca70..d2acc8e4c7 100644 --- a/doc/install-guide/ch_swift.xml +++ b/doc/install-guide/ch_swift.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch_swift"> - Add the Object Storage service + Add Object Storage The OpenStack Object Storage services work together to provide object storage and retrieval through a REST API. For this example architecture, you must have already installed the Identity Service, also known as Keystone. diff --git a/doc/install-guide/section_ceilometer-nova.xml b/doc/install-guide/section_ceilometer-nova.xml index 3808295bb1..3b4aceff16 100644 --- a/doc/install-guide/section_ceilometer-nova.xml +++ b/doc/install-guide/section_ceilometer-nova.xml @@ -8,8 +8,8 @@ OpenStack Telemetry is an API service that provides a collector and a range of disparate agents. This procedure - details how to install the agent that runs on Compute - nodes. + details how to install the agent that runs on the compute + node. Install the Telemetry service on the Compute node: # apt-get install ceilometer-agent-compute diff --git a/doc/install-guide/section_dashboard-install.xml b/doc/install-guide/section_dashboard-install.xml index 7c9e2bd419..3d7a5ed0c9 100644 --- a/doc/install-guide/section_dashboard-install.xml +++ b/doc/install-guide/section_dashboard-install.xml @@ -22,7 +22,7 @@ For more information about how to deploy the dashboard, see Deploying the Horizon dashboard. + >deployment topics in the developer documentation. Install the dashboard on the node that can contact diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml index 6e30aaa6be..7fcdf8aa31 100644 --- a/doc/install-guide/section_keystone-install.xml +++ b/doc/install-guide/section_keystone-install.xml @@ -94,7 +94,7 @@ IDENTIFIED BY 'KEYSTONE_DBPASS'; contains the password you have set using debconf: [DEFAULT] -# A "shared secret" between OpenStack Identity Service and other OpenStack services +# A "shared secret" between keystone and other openstack services admin_token = ADMIN_TOKEN ... @@ -179,7 +179,7 @@ admin_token = ADMIN_TOKEN the [DEFAULT] section, replacing ADMIN_TOKEN with the results of the command. [DEFAULT] -# A "shared secret" between OpenStack Identity Service and other OpenStack services +# A "shared secret" between keystone and other openstack services admin_token = ADMIN_TOKEN ... diff --git a/doc/install-guide/section_keystone-users.xml b/doc/install-guide/section_keystone-users.xml index f1d368aa30..555c36b946 100644 --- a/doc/install-guide/section_keystone-users.xml +++ b/doc/install-guide/section_keystone-users.xml @@ -8,17 +8,18 @@ tenants, and roles to authenticate against. These are used to allow access to services and endpoints, described in the next section. - Typically, you would use a user name and password to authenticate - with the Identity Service. At this point, however, we have not created - any users, so we have to use the authorization token created in the - previous section. You can pass this with the - option to the keystone command or set the - OS_SERVICE_TOKEN environment variable. We'll set - OS_SERVICE_TOKEN, as well as - OS_SERVICE_ENDPOINT to specify where the Identity - Service is running. Replace - FCAF3E... - with your authorization token. + Typically, you would indicate a user and password to + authenticate with the Identity Service. At this point, however, we + have not created any users, so we have to use the authorization + token created in the previous section. You can pass this with the + option to the + keystone command or set the + OS_SERVICE_TOKEN environment variable. We'll set + OS_SERVICE_TOKEN, as well as + OS_SERVICE_ENDPOINT to specify where the Identity + Service is running. Replace + FCAF3E... + with your authorization token. # export OS_SERVICE_TOKEN=FCAF3E... # export OS_SERVICE_ENDPOINT=http://controller:35357/v2.0 diff --git a/doc/install-guide/section_nova-network.xml b/doc/install-guide/section_nova-network.xml index d7bae635ea..c061772a92 100644 --- a/doc/install-guide/section_nova-network.xml +++ b/doc/install-guide/section_nova-network.xml @@ -3,10 +3,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="nova-network"> Enable Networking - The example in this section shows how to set up OpenStack - Compute networking to use a flat network and DHCP. This set up - is the simplest production-ready configuration that - is available. + Configuring Networking can be a bewildering experience. The + following example shows the simplest production-ready configuration + that is available: the legacy networking in OpenStack Compute, with + a flat network, that takes care of DHCP. This set up uses multi-host functionality. Networking is configured to be highly available by distributing networking functionality across multiple hosts. As a result, no single