From 20ce172d503967a1b90359409bddc19bb3ee5d76 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Mon, 21 Apr 2014 10:42:17 +0200
Subject: [PATCH] Use the same cirros image ID everywhere

Update the ID of the cirros image in code examples for consistency.

Also fix the image name where it wasn't updated (0.3.1 -> 0.3.2).

Change-Id: I254cffb43652e0ed706cfe31c90a7148780a8630
---
 doc/install-guide/section_ceilometer-verify.xml       | 2 +-
 doc/install-guide/section_launch-instance-neutron.xml | 4 ++--
 doc/install-guide/section_launch-instance-nova.xml    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/install-guide/section_ceilometer-verify.xml b/doc/install-guide/section_ceilometer-verify.xml
index e7fadc7dc7..a91d1192f5 100644
--- a/doc/install-guide/section_ceilometer-verify.xml
+++ b/doc/install-guide/section_ceilometer-verify.xml
@@ -20,7 +20,7 @@
     </step>
     <step>
       <para>Download an image from the Image Service:</para>
-      <screen><prompt>$</prompt> <userinput>glance image-download "CirrOS 0.3.2" > cirros.img</userinput></screen>
+      <screen><prompt>$</prompt> <userinput>glance image-download "cirros-0.3.2-x86_64" > cirros.img</userinput></screen>
     </step>
     <step>
       <para>Call the <literal>ceilometer meter-list</literal> command again to
diff --git a/doc/install-guide/section_launch-instance-neutron.xml b/doc/install-guide/section_launch-instance-neutron.xml
index 36b2476804..70dd8bd1c3 100644
--- a/doc/install-guide/section_launch-instance-neutron.xml
+++ b/doc/install-guide/section_launch-instance-neutron.xml
@@ -66,7 +66,7 @@
 <computeroutput>+--------------------------------------+---------------------+--------+--------+
 | ID                                   | Name                | Status | Server |
 +--------------------------------------+---------------------+--------+--------+
-| e4d5edea-f07e-4faa-8390-b71e9b747267 | cirros-0.3.2-x86_64 | ACTIVE |        |
+| acafc7c0-40aa-4026-9673-b879898e1fc2 | cirros-0.3.2-x86_64 | ACTIVE |        |
 +--------------------------------------+---------------------+--------+--------+</computeroutput></screen>
       <para>Your first instance uses the
         <literal>cirros-0.3.2-x86_64</literal> image.</para>
@@ -123,7 +123,7 @@
 | flavor                               | m1.tiny (1)                                                |
 | hostId                               |                                                            |
 | id                                   | 05682b91-81a1-464c-8f40-8b3da7ee92c5                       |
-| image                                | cirros-0.3.1-x86_64 (e4d5edea-f07e-4faa-8390-b71e9b747267) |
+| image                                | cirros-0.3.2-x86_64 (acafc7c0-40aa-4026-9673-b879898e1fc2) |
 | key_name                             | demo-key                                                   |
 | metadata                             | {}                                                         |
 | name                                 | demo-instance1                                             |
diff --git a/doc/install-guide/section_launch-instance-nova.xml b/doc/install-guide/section_launch-instance-nova.xml
index a00b5b1fdf..9bb294d251 100644
--- a/doc/install-guide/section_launch-instance-nova.xml
+++ b/doc/install-guide/section_launch-instance-nova.xml
@@ -66,7 +66,7 @@
 <computeroutput>+--------------------------------------+---------------------+--------+--------+
 | ID                                   | Name                | Status | Server |
 +--------------------------------------+---------------------+--------+--------+
-| e4d5edea-f07e-4faa-8390-b71e9b747267 | cirros-0.3.2-x86_64 | ACTIVE |        |
+| acafc7c0-40aa-4026-9673-b879898e1fc2 | cirros-0.3.2-x86_64 | ACTIVE |        |
 +--------------------------------------+---------------------+--------+--------+</computeroutput></screen>
       <para>Your first instance uses the
         <literal>cirros-0.3.2-x86_64</literal> image.</para>
@@ -128,7 +128,7 @@
 | flavor                               | m1.tiny (1)                                                |
 | hostId                               |                                                            |
 | id                                   | 45ea195c-c469-43eb-83db-1a663bbad2fc                       |
-| image                                | cirros-0.3.1-x86_64 (081dab35-690e-419b-8ce0-7fe232e5fec6) |
+| image                                | cirros-0.3.2-x86_64 (acafc7c0-40aa-4026-9673-b879898e1fc2) |
 | key_name                             | demo-key                                                   |
 | metadata                             | {}                                                         |
 | name                                 | demo-instance1                                             |