From ae6920fb6b367b5aa75e02c72275e3149d02cd70 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 22 Oct 2012 10:11:08 -0700
Subject: [PATCH] Declare vpn client option in pipelib

Due to some import refactoring, nova.network.manager isn't always
imported when running pipelib commands, so using the cnt_vpn_clients
option fails. A failing test could not be added because our testing
code imports nova.network.manager so the code config option always
exists in testing.

Fixes bug 1069573

Change-Id: I92b702556bfef2610b86a952dd6f9207fbab102a
---
 nova/cloudpipe/pipelib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 4e498e2c91d2..206ce1835935 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -52,6 +52,7 @@ cloudpipe_opts = [
                help=_('Netmask to push into openvpn config')),
     ]
 
+flags.DECLARE('cnt_vpn_clients', 'nova.network.manager')
 FLAGS = flags.FLAGS
 FLAGS.register_opts(cloudpipe_opts)