diff --git a/doc/install-guide/object-storage/section_swift-controller-node.xml b/doc/install-guide/object-storage/section_swift-controller-node.xml
index 23f2915f55..41ef55a625 100644
--- a/doc/install-guide/object-storage/section_swift-controller-node.xml
+++ b/doc/install-guide/object-storage/section_swift-controller-node.xml
@@ -22,8 +22,8 @@
it also offers an internal mechanism that allows it to operate without
any other OpenStack services. However, for simplicity, this guide
references the Identity service in . Before
- you configure the Object Storage service, you must create Identity
- service credentials including endpoints.
+ you configure the Object Storage service, you must create service
+ credentials and API endpoints.
The Object Storage service does not use a SQL database on
the controller node.
@@ -33,7 +33,7 @@
steps:
- Create a swift user:
+ Create the swift user:
$ keystone user-create --name swift --pass SWIFT_PASS
+----------+----------------------------------+
| Property | Value |
@@ -48,16 +48,15 @@
password.
- Link the swift user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ swift user:
$ keystone user-role-add --user swift --tenant service --role admin
This command provides no output.
- Create the swift service:
+ Create the swift service entity:
$ keystone service-create --name swift --type object-store \
--description "OpenStack Object Storage"
+-------------+----------------------------------+
@@ -73,7 +72,7 @@
- Create the Identity service endpoints:
+ Create the Object Storage service API endpoints:
$ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ object-store / {print $2}') \
--publicurl 'http://controller:8080/v1/AUTH_%(tenant_id)s' \
diff --git a/doc/install-guide/section_ceilometer-controller.xml b/doc/install-guide/section_ceilometer-controller.xml
index cbe493e336..c48964d2b7 100644
--- a/doc/install-guide/section_ceilometer-controller.xml
+++ b/doc/install-guide/section_ceilometer-controller.xml
@@ -16,11 +16,11 @@
To configure prerequisites
Before you install and configure Telemetry, you must install
- MongoDB, create a MongoDB database, and
- create Identity service credentials including endpoints.
+ MongoDB, create a MongoDB database,
+ service credentials, and API endpoints.
Enable the Open Build Service repositories for MongoDB based on
- your openSUSE or SLES version:
+ your openSUSE or SLES version:
On openSUSE:
# zypper addrepo -f obs://server:database/openSUSE_13.1 Database
On SLES:
@@ -104,7 +104,7 @@ Key Expires: Sat Dec 20 20:08:39 2014
$ source admin-openrc.sh
- To create the Identity service credentials:
+ To create the service credentials, complete these steps:
Create the ceilometer user:
@@ -113,26 +113,26 @@ Key Expires: Sat Dec 20 20:08:39 2014
suitable password.
- Link the ceilometer user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ ceilometer user.
$ keystone user-role-add --user ceilometer --tenant service --role admin
- Create the ceilometer service:
+ Create the ceilometer service
+ entity:
$ keystone service-create --name ceilometer --type metering \
--description "Telemetry"
-
- Create the Identity service endpoints:
- $ keystone endpoint-create \
+
+
+
+ Create the Telemetry service API endpoints:
+ $ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ metering / {print $2}') \
--publicurl http://controller:8777 \
--internalurl http://controller:8777 \
--adminurl http://controller:8777 \
--region regionOne
-
-
diff --git a/doc/install-guide/section_cinder-controller-node.xml b/doc/install-guide/section_cinder-controller-node.xml
index ed10e06d9d..9c233ef4bf 100644
--- a/doc/install-guide/section_cinder-controller-node.xml
+++ b/doc/install-guide/section_cinder-controller-node.xml
@@ -11,9 +11,8 @@
volumes to instances.
To configure prerequisites
- Before you install and configure the Block Storage service, you must
- create a database and Identity service credentials including
- endpoints.
+ Before you install and configure the Block Storage service, you
+ must create a database, service credentials, and API endpoints.
To create the database, complete these steps:
@@ -47,8 +46,7 @@
$ source admin-openrc.sh
- To create the Identity service credentials, complete these
- steps:
+ To create the service credentials, complete these steps:
Create a cinder user:
@@ -66,16 +64,15 @@
password.
- Link the cinder user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ cinder user:
$ keystone user-role-add --user cinder --tenant service --role admin
This command provides no output.
- Create the cinder services:
+ Create the cinder service entities:
$ keystone service-create --name cinder --type volume \
--description "OpenStack Block Storage"
+-------------+----------------------------------+
@@ -99,13 +96,15 @@
| type | volumev2 |
+-------------+----------------------------------+
- The Block Storage service requires two different services
- to support API versions 1 and 2.
+ The Block Storage service requires two different service
+ entities to support API versions 1 and 2.
-
- Create the Block Storage service endpoints:
- $ keystone endpoint-create \
+
+
+
+ Create the Block Storage service API endpoints:
+ $ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ volume / {print $2}') \
--publicurl http://controller:8776/v1/%\(tenant_id\)s \
--internalurl http://controller:8776/v1/%\(tenant_id\)s \
@@ -137,12 +136,10 @@
| region | regionOne |
| service_id | 16e038e449c94b40868277f1d801edb5 |
+-------------+-----------------------------------------+
-
- The Block Storage service requires two different endpoints
- to support API versions 1 and 2.
-
-
-
+
+ The Block Storage service requires two different endpoints
+ to support API versions 1 and 2.
+
diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index c1c6e68f5b..81de85772b 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -16,8 +16,8 @@
To configure prerequisites
- Before you install and configure the Image Service, you must create
- a database and Identity service credentials including endpoints.
+ Before you install and configure the Image Service, you must
+ create a database, service credentials, and API endpoints.
To create the database, complete these steps:
@@ -51,8 +51,7 @@
$ source admin-openrc.sh
- To create the Identity service credentials, complete these
- steps:
+ To create the service credentials, complete these steps:
Create the glance user:
@@ -70,16 +69,15 @@
password.
- Link the glance user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ glance user:
$ keystone user-role-add --user glance --tenant service --role admin
This command provides no output.
- Create the glance service:
+ Create the glance service entity:
$ keystone service-create --name glance --type image \
--description "OpenStack Image Service"
+-------------+----------------------------------+
@@ -95,7 +93,7 @@
- Create the Identity service endpoints:
+ Create the Image Service API endpoints:
$ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ image / {print $2}') \
--publicurl http://controller:9292 \
diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index 99d0c91b14..a00a6bcc68 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -10,7 +10,7 @@
To configure prerequisites
Before you install and configure Orchestration, you must create a
- database and Identity service credentials including endpoints.
+ database, service credentials, and API endpoints.
To create the database, complete these steps:
@@ -44,8 +44,7 @@
$ source admin-openrc.sh
- To create the Identity service credentials, complete these
- steps:
+ To create the service credentials, complete these steps:
Create the heat user:
@@ -63,9 +62,8 @@
password.
- Link the heat user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ heat user:
$ keystone user-role-add --user heat --tenant service --role admin
This command provides no output.
@@ -98,7 +96,7 @@
Create the heat and
- heat-cfn services:
+ heat-cfn service entities:
$ keystone service-create --name heat --type orchestration \
--description "Orchestration"
+-------------+----------------------------------+
@@ -122,9 +120,11 @@
| type | cloudformation |
+-------------+----------------------------------+
-
- Create the Identity service endpoints:
- $ keystone endpoint-create \
+
+
+
+ Create the Orchestration service API endpoints:
+ $ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ orchestration / {print $2}') \
--publicurl http://controller:8004/v1/%\(tenant_id\)s \
--internalurl http://controller:8004/v1/%\(tenant_id\)s \
@@ -156,8 +156,6 @@
| region | regionOne |
| service_id | 297740d74c0a446bbff867acdccb33fa |
+-------------+----------------------------------+
-
-
diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml
index 0b26041a94..2c712a661a 100644
--- a/doc/install-guide/section_keystone-services.xml
+++ b/doc/install-guide/section_keystone-services.xml
@@ -8,7 +8,8 @@
Create the service entity and API endpoint
After you create tenants, users, and roles, you must create the
service entity and
- API endpoint for the Identity service.
+ API endpoints for the
+ Identity service.
To configure prerequisites
@@ -18,7 +19,7 @@
- To create the service entity and API endpoint
+ To create the service entity and API endpoints
The Identity service manages a catalog of services in your
OpenStack environment. Services use this catalog to locate other
@@ -52,7 +53,7 @@
scalability. For simplicity, this configuration uses the management
network for all endpoint variations and the
regionOne region.
- Create the API endpoint for the Identity service:
+ Create the Identity service API endpoints:
$ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ identity / {print $2}') \
--publicurl http://controller:5000/v2.0 \
diff --git a/doc/install-guide/section_neutron-controller-node.xml b/doc/install-guide/section_neutron-controller-node.xml
index 0061e361ff..e0ad2cf629 100644
--- a/doc/install-guide/section_neutron-controller-node.xml
+++ b/doc/install-guide/section_neutron-controller-node.xml
@@ -7,8 +7,9 @@
Install and configure controller node
To configure prerequisites
- Before you configure OpenStack Networking (neutron), you must create
- a database and Identity service credentials including endpoints.
+ Before you configure the OpenStack Networking (neutron) service,
+ you must create a database, service credentials, and API
+ endpoints.
To create the database, complete these steps:
@@ -42,8 +43,7 @@
$ source admin-openrc.sh
- To create the Identity service credentials, complete these
- steps:
+ To create the service credentials, complete these steps:
Create the neutron user:
@@ -61,16 +61,15 @@
password.
- Link the neutron user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ neutron user:
$ keystone user-role-add --user neutron --tenant service --role admin
This command provides no output.
- Create the neutron service:
+ Create the neutron service entity:
$ keystone service-create --name neutron --type network \
--description "OpenStack Networking"
+-------------+----------------------------------+
@@ -83,9 +82,11 @@
| type | network |
+-------------+----------------------------------+
-
- Create the Identity service endpoints:
- $ keystone endpoint-create \
+
+
+
+ Create the Networking service API endpoints:
+ $ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ network / {print $2}') \
--publicurl http://controller:9696 \
--adminurl http://controller:9696 \
@@ -101,8 +102,6 @@
| region | regionOne |
| service_id | 6369ddaf99a447f3a0d41dac5e342161 |
+-------------+----------------------------------+
-
-
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index 4533341cc2..56b1652b79 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-install.xml
@@ -9,9 +9,8 @@
Compute service, code-named nova, on the controller node.
To configure prerequisites
- Before you install and configure Compute, you must
- create a database and Identity service credentials
- including endpoints.
+ Before you install and configure the Compute service, you must
+ create a database, service credentials, and API endpoints.
To create the database, complete these steps:
@@ -47,8 +46,7 @@
$ source admin-openrc.sh
- To create the Identity service credentials, complete these
- steps:
+ To create the service credentials, complete these steps:
Create the nova user:
@@ -67,16 +65,15 @@
a suitable password.
- Link the nova user to the
- service tenant and admin
- role:
+ Add the admin role to the
+ nova user:
$ keystone user-role-add --user nova --tenant service --role admin
This command provides no output.
- Create the nova service:
+ Create the nova service entity:
$ keystone service-create --name nova --type compute \
--description "OpenStack Compute"
+-------------+----------------------------------+
@@ -93,7 +90,7 @@
- Create the Compute service endpoints:
+ Create the Compute service API endpoints:
$ keystone endpoint-create \
--service-id $(keystone service-list | awk '/ compute / {print $2}') \
--publicurl http://controller:8774/v2/%\(tenant_id\)s \