From 3eaab92123f4da98c3b0330653c190604281bc68 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 24 Jun 2010 04:11:58 +0100 Subject: sensible defaults for instance types --- nova/cloudpipe/pipelib.py | 1 + nova/endpoint/cloud.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index df7af7e15..adbea6878 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -63,6 +63,7 @@ class CloudPipe(object): user_data=zippy.read().encode("base64").encode("base64"), max_count=1, min_count=1, + instance_type='m1.tiny', image_id=FLAGS.vpn_image_id, key_name=key_name, security_groups=["vpn-secgroup"]) diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 4a115fe35..8a3604f67 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -490,7 +490,7 @@ class CloudController(object): # TODO(ja): add ari, aki inst['image_id'] = kwargs['image_id'] inst['user_data'] = kwargs.get('user_data', '') - inst['instance_type'] = kwargs.get('instance_type', '') + inst['instance_type'] = kwargs.get('instance_type', 'm1.small') inst['reservation_id'] = reservation_id inst['launch_time'] = launch_time inst['key_data'] = key_data or '' -- cgit