From 581dfb3fa17f72e65137c77db58fafa2b23abc38 Mon Sep 17 00:00:00 2001
From: JUNJIE NAN <nanjj@cn.ibm.com>
Date: Fri, 21 Nov 2014 18:42:17 +0800
Subject: [PATCH] Add network parameter to templates

Or nova will complain do not know how to select network

Change-Id: I628d6c2dbc4bfe03577488fa464b8d3083d27dd3
---
 hot/autoscaling.yaml | 5 +++++
 hot/lb_server.yaml   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/hot/autoscaling.yaml b/hot/autoscaling.yaml
index 7ec7fc85..e7fd12e3 100644
--- a/hot/autoscaling.yaml
+++ b/hot/autoscaling.yaml
@@ -13,6 +13,9 @@ parameters:
   database_flavor:
     type: string
     description: flavor used by the db server
+  network:
+    type: string
+    description: Network used by the server
   subnet_id:
     type: string
     description: subnet on which the load balancer will be located
@@ -38,6 +41,7 @@ resources:
       flavor: {get_param: database_flavor}
       image: {get_param: image}
       key_name: {get_param: key}
+      networks: [{network: {get_param: network} }]
       user_data_format: RAW
       user_data:
         str_replace:
@@ -70,6 +74,7 @@ resources:
           flavor: {get_param: flavor}
           image: {get_param: image}
           key_name: {get_param: key}
+          network: {get_param: network}
           pool_id: {get_resource: pool}
           metadata: {"metering.stack": {get_param: "OS::stack_id"}}
           user_data:
diff --git a/hot/lb_server.yaml b/hot/lb_server.yaml
index 960bddb5..3e9da6de 100644
--- a/hot/lb_server.yaml
+++ b/hot/lb_server.yaml
@@ -18,6 +18,10 @@ parameters:
     description: Server user_data
   metadata:
     type: json
+  network:
+    type: string
+    description: Network used by the server
+
 resources:
   server:
     type: OS::Nova::Server
@@ -28,6 +32,7 @@ resources:
       metadata: {get_param: metadata}
       user_data: {get_param: user_data}
       user_data_format: RAW
+      networks: [{network: {get_param: network} }]
   member:
     type: OS::Neutron::PoolMember
     properties: