From 0a2e9381b7ef084fbd1462cc64776e82cab1d96c Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Tue, 3 Feb 2015 16:27:47 +0100
Subject: [PATCH] Add heat stack sample directly into the programlisting

To not longer use files located in samples/ it is necessary to move
the contents from those files directly into the programlistings.

Change-Id: I3c2e30ba9511eea094ed2f02088488a3d11f22a1
---
 doc/install-guide/samples/test-stack.yml  | 26 -------------------
 doc/install-guide/section_heat-verify.xml | 31 ++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 doc/install-guide/samples/test-stack.yml

diff --git a/doc/install-guide/samples/test-stack.yml b/doc/install-guide/samples/test-stack.yml
deleted file mode 100644
index 966d136e38..0000000000
--- a/doc/install-guide/samples/test-stack.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Test Template
-
-parameters:
-  ImageID:
-    type: string
-    description: Image use to boot a server
-  NetID:
-    type: string
-    description: Network ID for the server
-
-resources:
-  server1:
-    type: OS::Nova::Server
-    properties:
-      name: "Test server"
-      image: { get_param: ImageID }
-      flavor: "m1.tiny"
-      networks:
-      - network: { get_param: NetID }
-
-outputs:
-  server1_private_ip:
-    description: IP address of the server in the private network
-    value: { get_attr: [ server1, first_address ] }
diff --git a/doc/install-guide/section_heat-verify.xml b/doc/install-guide/section_heat-verify.xml
index 3f6aac0285..811ea51d3c 100644
--- a/doc/install-guide/section_heat-verify.xml
+++ b/doc/install-guide/section_heat-verify.xml
@@ -21,7 +21,36 @@
         documentation</link>.</para>
       <para>Create a test template in the <filename>test-stack.yml</filename>
         file with the following content:</para>
-      <programlisting language="yml"><xi:include parse="text" href="samples/test-stack.yml"/></programlisting>
+      <programlisting language="yml">heat_template_version: 2014-10-16
+description: A simple server.
+
+parameters:
+  ImageID:
+    type: string
+    description: Image use to boot a server
+  NetID:
+    type: string
+    description: Network ID for the server
+
+resources:
+  ImageID:
+    type: string
+    description: Image use to boot a server
+  NetID:
+    type: string
+    description: Network ID for the server
+  server:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ImageID }
+      flavor: m1.tiny
+      networks:
+      - network: { get_param: NetID }
+
+outputs:
+  private_ip:
+    description: IP address of the server in the private network
+    value: { get_attr: [ server, first_address ] }</programlisting>
     </step>
     <step>
       <para>Use the <command>heat stack-create</command> command to create a