From bd717859accc37b3c78beb3c0af431764f547e45 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Wed, 16 Apr 2014 09:44:25 +0200
Subject: [PATCH] Make the heat template work with nova-network

The current template assumes that neutron is used, this patch updates it
to work with both nova-net and neutron.

Change-Id: I98a1b9956be62e07f0b931d956a8f546248addfe
Closes-Bug: #1308359
---
 doc/install-guide/samples/test-stack.yml  | 12 +-----------
 doc/install-guide/section_heat-verify.xml |  5 ++---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/doc/install-guide/samples/test-stack.yml b/doc/install-guide/samples/test-stack.yml
index 62961e5c18..966d136e38 100644
--- a/doc/install-guide/samples/test-stack.yml
+++ b/doc/install-guide/samples/test-stack.yml
@@ -9,9 +9,6 @@ parameters:
   NetID:
     type: string
     description: Network ID for the server
-  SubNetID:
-    type: string
-    description: Subnet ID for the server
 
 resources:
   server1:
@@ -21,14 +18,7 @@ resources:
       image: { get_param: ImageID }
       flavor: "m1.tiny"
       networks:
-        - port: { get_resource: server1_port }
-
-  server1_port:
-    type: OS::Neutron::Port
-    properties:
-      network_id: { get_param: NetID }
-      fixed_ips:
-        - subnet_id: { get_param: SubNetID }
+      - network: { get_param: NetID }
 
 outputs:
   server1_private_ip:
diff --git a/doc/install-guide/section_heat-verify.xml b/doc/install-guide/section_heat-verify.xml
index 912388350c..ad234dde30 100644
--- a/doc/install-guide/section_heat-verify.xml
+++ b/doc/install-guide/section_heat-verify.xml
@@ -23,10 +23,9 @@
 
   <para>Use the <command>heat stack-create</command> command to create a stack
       from this template:</para>
-  <screen><prompt>$</prompt> <userinput>NET_ID=$(neutron net-list | awk '/ demo-net / { print $2 }')</userinput>
-<prompt>$</prompt> <userinput>SUBNET_ID=$(neutron subnet-list | awk '/ demo-subnet / { print $2 }')</userinput>
+  <screen><prompt>$</prompt> <userinput>NET_ID=$(nova net-list | awk '/ demo-net / { print $2 }')</userinput>
 <prompt>$</prompt> <userinput>heat stack-create -f test-stack.yml \
-  -P "ImageID=cirros-0.3.2-x86_64;NetID=$NET_ID;SubNetID=$SUBNET_ID" testStack</userinput>
+  -P "ImageID=cirros-0.3.2-x86_64;NetID=$NET_ID" testStack</userinput>
 <computeroutput>+--------------------------------------+------------+--------------------+----------------------+
 | id                                   | stack_name | stack_status       | creation_time        |
 +--------------------------------------+------------+--------------------+----------------------+