From 67829efba38c32fb50efc6f3ce72b17051ef27a2 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 24 Jun 2010 21:04:55 -0700
Subject: [PATCH] Use flag for vpn key suffix instead of hardcoded string

---
 nova/endpoint/cloud.py | 7 ++++---
 nova/flags.py          | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index d6c16416..8eaa8213 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -178,7 +178,8 @@ class CloudController(object):
         result = []
         for key_pair in key_pairs:
             # filter out the vpn keys
-            if context.user.is_admin() or not key_pair.name.endswith('-key'):
+            suffix = FLAGS.vpn_key_suffix
+            if context.user.is_admin() or not key_pair.name.endswith(suffix):
                 result.append({
                     'keyName': key_pair.name,
                     'keyFingerprint': key_pair.fingerprint,
@@ -609,9 +610,9 @@ class CloudController(object):
         result = { 'image_id': image_id, 'launchPermission': [] }
         if image['isPublic']:
             result['launchPermission'].append({ 'group': 'all' })
-        
+
         return defer.succeed(result)
-        
+
     @rbac.allow('projectmanager', 'sysadmin')
     def modify_image_attribute(self, context, image_id, attribute, operation_type, **kwargs):
         # TODO(devcamcar): Support users and groups other than 'all'.
diff --git a/nova/flags.py b/nova/flags.py
index bf7b6e3a..396276ea 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -75,6 +75,10 @@ DEFINE_string('default_instance_type',
 
 DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 
+flags.DEFINE_string('vpn_key_suffix',
+                    '-key',
+                    'Suffix to add to project name for vpn key')
+
 # UNUSED
 DEFINE_string('node_availability_zone',
                     'nova',