commit eab474dc92c578366e6498123e7526a6471389f4
author Jenkins <jenkins@review.openstack.org> Tue Feb 24 17:38:48 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 24 17:38:48 2015 +0000
tree 79bfefde2e3ad7d8008fa79aa147c49285924eed
parent 8d1050cea076bb44ec35e6089e1e22019eb75264
parent 0e7ad374ff12a41c5e0e033d68d4eb95d4ab6f2c

Merge "Use the AWS instance type in the cfn_init scenario"

functional/test_autoscaling.py

diff --git a/functional/test_autoscaling.py b/functional/test_autoscaling.py
index 15b318b..60fa66f 100644
--- a/functional/test_autoscaling.py
+++ b/functional/test_autoscaling.py
@@ -70,7 +70,7 @@
   InstanceType: {type: string}
   SecurityGroups: {type: comma_delimited_list}
   UserData: {type: string}
-  Tags: {type: comma_delimited_list}
+  Tags: {type: comma_delimited_list, default: "x,y"}
 
 resources:
   random1:
@@ -93,7 +93,7 @@
   InstanceType: {type: string}
   SecurityGroups: {type: comma_delimited_list}
   UserData: {type: string}
-  Tags: {type: comma_delimited_list}
+  Tags: {type: comma_delimited_list, default: "x,y"}
 
 resources:
   random1:
@@ -612,7 +612,7 @@
   InstanceType: {type: string}
   SecurityGroups: {type: comma_delimited_list}
   UserData: {type: string}
-  Tags: {type: comma_delimited_list}
+  Tags: {type: comma_delimited_list, default: "x,y"}
 
 resources:
 outputs: