diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index 2bcb246456..825127fdba 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -60,15 +60,11 @@
Edit
/etc/glance/glance-api.conf and
/etc/glance/glance-registry.conf and
- change the [database] section.
+ add the [database] section at the end of each
+ file:
...
[database]
-...
-# SQLAlchemy connection string for the reference implementation
-# registry server. Any valid SQLAlchemy connection string is fine.
-# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-connection = mysql://glance:GLANCE_DBPASS@controller/glance
-...
+connection = mysql://glance:GLANCE_DBPASS@controller/glance
Use the openstack-db command to create
@@ -80,8 +76,9 @@ connection = mysql://glance:GLANCE_DBPASS@controller/
By default, the Ubuntu packages create an SQLite database.
Delete the glance.sqlite file created in
the /var/lib/glance/ directory so that it
- does not get used by mistake.
-
+ does not get used by mistake:
+ # rm /var/lib/glance/glance.sqlite
+
Use the password you created to log in as root and create
a glance database user:
@@ -102,7 +99,7 @@ IDENTIFIED BY 'GLANCE_DBPASS';
Choose a password and specify an email address for the
glance user. Use the
service tenant and give the user the
- admin role.
+ admin role:
$ keystone user-create --name=glance --pass=GLANCE_PASS \
--email=glance@example.com
$ keystone user-role-add --user=glance --tenant=service --role=admin
@@ -145,10 +142,9 @@ IDENTIFIED BY 'GLANCE_DBPASS';
for the glance user in the Identity Service.
- Add the following keys under the
+ Add or modify the following keys under the
[keystone_authtoken] section:
[keystone_authtoken]
-...
auth_uri = http://controller:5000
auth_host = controller
auth_port = 35357
@@ -158,7 +154,7 @@ admin_user = glance
admin_password = GLANCE_PASS
- Add the following key under the
+ Modify the following key under the
[paste_deploy] section:
[paste_deploy]
...
@@ -180,7 +176,7 @@ flavor = keystone
Restart the glance
- service with its new settings.
+ service with its new settings:
# service glance-registry restart
# service glance-api restart
diff --git a/doc/install-guide/section_glance-verify.xml b/doc/install-guide/section_glance-verify.xml
index e9ca0be92f..bb8908f239 100644
--- a/doc/install-guide/section_glance-verify.xml
+++ b/doc/install-guide/section_glance-verify.xml
@@ -149,8 +149,9 @@
Alternatively, the upload to the Image Service can be done without having to use local disk space to store the file, by use of the --copy-from parameter.
For example:
$ glance image-create --name="CirrOS 0.3.1" --disk-format=qcow2 \
- --container-format=bare --is-public=true --copy-from http://cdn.download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
- +------------------+--------------------------------------+
+ --container-format=bare --is-public=true \
+ --copy-from http://cdn.download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
++------------------+--------------------------------------+
| Property | Value |
+------------------+--------------------------------------+
| checksum | d972013792949d0d3ba628fbe8685bce |