diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index 1a9efc1fc8..7f3b347e23 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -22,7 +22,7 @@
Install the Image Service on the controller node.
# apt-get install glance
# yum install openstack-glance
- # zypper install openstack-glance
+ # zypper install openstack-glance python-glanceclient
The Image Service stores information about images in a database.
This guide uses the MySQL database used by other OpenStack services.
@@ -53,9 +53,9 @@ IDENTIFIED BY 'GLANCE_DBPASS';
have separate configuration files, so you must configure both files throughout this
section.
# openstack-config --set /etc/glance/glance-api.conf \
- DEFAULT sql_connection mysql://glance:GLANCE_PASS@controller/glance
+ DEFAULT sql_connection mysql://glance:GLANCE_DBPASS@controller/glance
# openstack-config --set /etc/glance/glance-registry.conf \
- DEFAULT sql_connection mysql://glance:GLANCE_PASS@controller/glance
+ DEFAULT sql_connection mysql://glance:GLANCE_DBPASS@controller/glance
Edit /etc/glance/glance-api.conf and /etc/glance/glance-registry.conf
and change the [DEFAULT] section.
@@ -81,18 +81,18 @@ sql_connection = mysql://glance:GLANCE_DBPASS@localhost/glance
Service can use to authenticate with the Identity Service. Use the
service tenant and give the user the
admin role.
- # keystone user-create --name=glance --pass=GLANCE_PASS --email=glance@example.com
+ # keystone user-create --name=glance --pass=GLANCE_DBPASS --email=glance@example.com
# keystone user-role-add --user=glance --tenant=service --role=admin
Add the credentials to the Image Service's configuration files.
# openstack-config --set /etc/glance/glance-api.conf keystone_authtoken auth_host controller
# openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_user glance
# openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_tenant_name service
-# openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_password GLANCE_PASS
+# openstack-config --set /etc/glance/glance-api.conf keystone_authtoken admin_password GLANCE_DBPASS
# openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken auth_host controller
# openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_user glance
# openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_tenant_name service
-# openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_password GLANCE_PASS
+# openstack-config --set /etc/glance/glance-registry.conf keystone_authtoken admin_password GLANCE_DBPASS
Edit /etc/glance/glance-api.conf and /etc/glance/glance-registry.conf
and change the [keystone_authtoken] section.
@@ -103,7 +103,7 @@ auth_port = 35357
auth_protocol = http
admin_tenant_name = service
admin_user = glance
-admin_password = GLANCE_PASS
+admin_password = GLANCE_DBPASS
...
@@ -117,7 +117,7 @@ paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=controller
admin_user=glance
admin_tenant_name=service
-admin_password=GLANCE_PASS -->
+admin_password=GLANCE_DBPASS -->
If you have troubles connecting to the database, try using the IP address instead of the
host name in the credentials.
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index f5e57c7d33..7f778ef5c8 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -78,16 +78,24 @@ admin_token = ADMIN_TOKEN
By default Keystone will use PKI tokens. Create the signing
keys and certificates.
- # keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+ # keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
# chown -R keystone:keystone /etc/keystone/* /var/log/keystone/keystone.log
+ # keystone-manage pki_setup --keystone-user openstack-keystone --keystone-group openstack-keystone
+# chown -R openstack-keystone:openstack-keystone /etc/keystone/* /var/log/keystone/keystone.log
+
+ Setup the /etc/keystone/default_catalog.templates file:
+
+ # KEYSTONE_CATALOG=/etc/keystone/default_catalog.templates
+# sed -e "s,%SERVICE_HOST%,192.168.0.10,g" -e "s/%S3_SERVICE_PORT%/8080/" \
+ $KEYSTONE_CATALOG.sample > $KEYSTONE_CATALOG
+
Restart the Identity service.
# service keystone restart
-
Start the Identity Service and enable it so it start when
the system boots.
diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml
index 81722e0f4f..2a93930535 100644
--- a/doc/install-guide/section_keystone-services.xml
+++ b/doc/install-guide/section_keystone-services.xml
@@ -38,10 +38,10 @@
API.
# keystone endpoint-create \
- --service-id=15c11a23667e427e91bc31335b45f4bd \
- --publicurl=http://controller:5000/v2.0 \
- --internalurl=http://controller:5000/v2.0 \
- --adminurl=http://controller:35357/v2.0
+ --service-id=the_service_id_above \
+ --publicurl=http://controller:5000/v2.0 \
+ --internalurl=http://controller:5000/v2.0 \
+ --adminurl=http://controller:35357/v2.0
+-------------+-----------------------------------+
| Property | Value |
+-------------+-----------------------------------+
diff --git a/doc/install-guide/section_keystone-verify.xml b/doc/install-guide/section_keystone-verify.xml
index ec24864406..0b45c7d71b 100644
--- a/doc/install-guide/section_keystone-verify.xml
+++ b/doc/install-guide/section_keystone-verify.xml
@@ -18,7 +18,7 @@
Request a authentication token 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
You should receive a token in response, paired with your user ID.
@@ -28,7 +28,7 @@
Next, verify that authorization is behaving as expected by requesting
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
You should receive a new token in response, this time including the