From c910b470e61a35230bc7ddaced13c3d51fac32fd Mon Sep 17 00:00:00 2001
From: andy <github@anarkystic.com>
Date: Thu, 24 Jun 2010 04:11:53 +0100
Subject: re-added cloudpipe

Conflicts:

	bin/nova-manage
	nova/auth/users.py
	nova/compute/network.py
---
 nova/flags.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nova/flags.py')

diff --git a/nova/flags.py b/nova/flags.py
index 7818e1b14..84a670e6b 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -68,6 +68,8 @@ DEFINE_string('default_instance_type',
                     'm1.small',
                     'default instance type to use, testing only')
 
+DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
+
 # UNUSED
 DEFINE_string('node_availability_zone',
                     'nova',
-- 
cgit