Small fixes on the install guide

- Use of colons instead of periods
- Fix the cirros image name, id and size in various places
- Use more restrictive permissions on /etc/keystone on RHEL

Change-Id: Id6eaec360ab9c25f6079c9729d53e98af693f7d1
This commit is contained in:
Gauvain Pocentek 2014-04-14 14:45:39 +02:00
parent 4588778170
commit d070a4c176
5 changed files with 27 additions and 26 deletions

View File

@ -11,7 +11,7 @@
<glossterm>Qpid</glossterm></phrase> but
<phrase os="ubuntu;debian;opensuse;sles"><glossterm>Qpid</glossterm></phrase>
<phrase os="centos;rhel;fedora"><glossterm>RabbitMQ</glossterm></phrase>
and <glossterm>ZeroMQ</glossterm> (0MQ) are also available.</para>
and <glossterm>ZeroMQ</glossterm> (0MQ) are also available:</para>
<screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install rabbitmq-server</userinput></screen>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install rabbitmq-server</userinput></screen>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install qpid-cpp-server</userinput></screen>
@ -33,7 +33,7 @@
<para os="fedora;centos;rhel">Disable Qpid authentication by
editing <filename>/etc/qpidd.conf</filename> file and changing
the <literal>auth</literal> option to
<literal>no</literal>.</para>
<literal>no</literal>:</para>
<screen os="fedora;centos;rhel"> <userinput>auth=no</userinput></screen>
<note os="fedora;centos;rhel">
<para>
@ -54,7 +54,7 @@
</para>
</note>
<para os="fedora;centos;rhel">Start Qpid and set it to start
automatically when the system boots.</para>
automatically when the system boots:</para>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>service qpidd start</userinput>
<prompt>#</prompt> <userinput>chkconfig qpidd on</userinput></screen>
<para os="opensuse;sles">Start the messaging service and set it to

View File

@ -14,8 +14,8 @@
<screen><computeroutput>+------------+-------+-------+--------------------------------------+---------+----------------------------------+
| Name | Type | Unit | Resource ID | User ID | Project ID |
+------------+-------+-------+--------------------------------------+---------+----------------------------------+
| image | gauge | image | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image.size | gauge | B | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image | gauge | image | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
| image.size | gauge | B | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
+------------+-------+-------+--------------------------------------+---------+----------------------------------+</computeroutput></screen>
</step>
<step>
@ -29,10 +29,10 @@
<screen><computeroutput>+----------------+-------+-------+--------------------------------------+---------+----------------------------------+
| Name | Type | Unit | Resource ID | User ID | Project ID |
+----------------+-------+-------+--------------------------------------+---------+----------------------------------+
| image | gauge | image | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image.download | delta | B | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image.serve | delta | B | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image.size | gauge | B | 9e5c2bee-0373-414c-b4af-b91b0246ad3b | None | e66d97ac1b704897853412fc8450f7b9 |
| image | gauge | image | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
| image.download | delta | B | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
| image.serve | delta | B | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
| image.size | gauge | B | acafc7c0-40aa-4026-9673-b879898e1fc2 | None | efa984b0a914450e9a47788ad330699d |
+----------------+-------+-------+--------------------------------------+---------+----------------------------------+</computeroutput></screen>
</step>
<step>
@ -41,7 +41,7 @@
<screen><computeroutput>+--------+---------------------+---------------------+-------+------------+------------+------------+------------+----------+----------------------------+----------------------------+
| Period | Period Start | Period End | Count | Min | Max | Sum | Avg | Duration | Duration Start | Duration End |
+--------+---------------------+---------------------+-------+------------+------------+------------+------------+----------+----------------------------+----------------------------+
| 60 | 2013-11-18T18:08:50 | 2013-11-18T18:09:50 | 1 | 13147648.0 | 13147648.0 | 13147648.0 | 13147648.0 | 0.0 | 2013-11-18T18:09:05.334000 | 2013-11-18T18:09:05.334000 |
| 60 | 2013-11-18T18:08:50 | 2013-11-18T18:09:50 | 1 | 13167616.0 | 13167616.0 | 13167616.0 | 13167616.0 | 0.0 | 2013-11-18T18:09:05.334000 | 2013-11-18T18:09:05.334000 |
+--------+---------------------+---------------------+-------+------------+------------+------------+------------+----------+----------------------------+----------------------------+</computeroutput></screen>
</step>
</procedure>

View File

@ -122,7 +122,7 @@
| is_public | True |
| min_disk | 0 |
| min_ram | 0 |
| name | CirrOS 0.3.2 |
| name | cirros-0.3.2-x86_64 |
| owner | efa984b0a914450e9a47788ad330699d |
| protected | False |
| size | 13167616 |
@ -139,16 +139,16 @@
<para>Confirm that the image was uploaded and display its
attributes:</para>
<screen><prompt>$</prompt> <userinput>glance image-list</userinput></screen>
<screen><computeroutput>+--------------------------------------+-----------------+-------------+------------------+----------+--------+
| ID | Name | Disk Format | Container Format | Size | Status |
+--------------------------------------+-----------------+-------------+------------------+----------+--------+
| acafc7c0-40aa-4026-9673-b879898e1fc2 | CirrOS 0.3.2 | qcow2 | bare | 13167616| active |
+--------------------------------------+-----------------+-------------+------------------+----------+--------+</computeroutput></screen>
<screen><computeroutput>+--------------------------------------+---------------------+-------------+------------------+----------+--------+
| ID | Name | Disk Format | Container Format | Size | Status |
+--------------------------------------+---------------------+-------------+------------------+----------+--------+
| acafc7c0-40aa-4026-9673-b879898e1fc2 | cirros-0.3.2-x86_64 | qcow2 | bare | 13167616 | active |
+--------------------------------------+---------------------+-------------+------------------+----------+--------+</computeroutput></screen>
</step>
</procedure>
<para>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 <parameter>--copy-from</parameter> parameter.</para>
<para>For example:</para>
<screen><prompt>$</prompt> <userinput>glance image-create --name="CirrOS 0.3.2" --disk-format=qcow2 \
<screen><prompt>$</prompt> <userinput>glance image-create --name="cirros-0.3.2-x86_64" --disk-format=qcow2 \
--container-format=bare --is-public=true \
--copy-from http://cdn.download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img</userinput>
<computeroutput>+------------------+--------------------------------------+
@ -163,8 +163,8 @@
| is_public | True |
| min_disk | 0 |
| min_ram | 0 |
| name | CirrOS 0.3.2 |
| owner | e519b772cb43474582fa303da62559e5 |
| name | cirros-0.3.2-x86_64 |
| owner | efa984b0a914450e9a47788ad330699d |
| protected | False |
| size | 13167616 |
| status | active |

View File

@ -190,9 +190,10 @@ admin_token = ADMIN_TOKEN
</step>
<step os="rhel;centos;fedora;opensuse;sles">
<para>By default, Keystone uses PKI tokens. Create the signing
keys and certificates:</para>
keys and certificates and restrict access to the generated data:</para>
<screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>keystone-manage pki_setup --keystone-user keystone --keystone-group keystone</userinput>
<prompt>#</prompt> <userinput>chown -R keystone:keystone /etc/keystone/* /var/log/keystone/keystone*.log</userinput></screen>
<prompt>#</prompt> <userinput>chown -R keystone:keystone /etc/keystone/ssl</userinput>
<prompt>#</prompt> <userinput>chmod -R o-rwx /etc/keystone/ssl</userinput></screen>
</step>
<step os="ubuntu">
<para>Configure the log directory. Edit the

View File

@ -211,11 +211,11 @@ admin_password = <replaceable>NOVA_PASS</replaceable></programlisting>
<para>To verify your configuration, list available
images:</para>
<screen><prompt>$</prompt> <userinput>nova image-list</userinput>
<computeroutput>+--------------------------------------+-----------------+--------+--------+
| ID | Name | Status | Server |
+--------------------------------------+-----------------+--------+--------+
| acafc7c0-40aa-4026-9673-b879898e1fc2 | CirrOS 0.3.2 | ACTIVE | |
+--------------------------------------+-----------------+--------+--------+</computeroutput></screen>
<computeroutput>+--------------------------------------+---------------------+--------+--------+
| ID | Name | Status | Server |
+--------------------------------------+---------------------+--------+--------+
| acafc7c0-40aa-4026-9673-b879898e1fc2 | cirros-0.3.2-x86_64 | ACTIVE | |
+--------------------------------------+---------------------+--------+--------+</computeroutput></screen>
</step>
</procedure>
</section>