Merge branch 'snapshot_support', closes #54
diff --git a/HISTORY.rst b/HISTORY.rst
index 7b17ece..ed6e009 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,11 @@
History
=======
+0.6.1 (7-08-2014)
+_________________
+
+* Fix bug in VPC creation when ec2stack is configured with a basic zone
+
0.6.0 (20-07-2014)
__________________
diff --git a/ec2stack/providers/cloudstack/vpcs.py b/ec2stack/providers/cloudstack/vpcs.py
index 55c81d8..9591d54 100644
--- a/ec2stack/providers/cloudstack/vpcs.py
+++ b/ec2stack/providers/cloudstack/vpcs.py
@@ -37,7 +37,14 @@
args['displaytext'] = name
args['zoneid'] = zones.get_zone(
current_app.config['CLOUDSTACK_DEFAULT_ZONE'])['id']
- args['vpcofferingid'] = current_app.config['VPC_OFFERING_ID']
+
+ if 'VPC_OFFERING_ID' in current_app.config:
+ args['vpcofferingid'] = current_app.config['VPC_OFFERING_ID']
+ else:
+ errors.invalid_request(
+ str('VPC_OFFERING_ID') + " not found in configuration, " +
+ "please run ec2stack-configure -a True")
+
args['cidr'] = helpers.get('CidrBlock')
response = requester.make_request_async(args)
diff --git a/setup.py b/setup.py
index 5c4a7f8..a24d436 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
PROJECT = 'ec2stack'
-VERSION = '0.6'
+VERSION = '0.6.1'
URL = 'http://github.com/imduffy15/ec2stack'
AUTHOR = 'Darren Brogan, Ian Duffy'
AUTHOR_EMAIL = 'brogand2@mail.dcu.ie, duffyi3@mail.dcu.ie'
