diff options
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 0e86f89b1..3c92f72b1 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -27,6 +27,7 @@ import string import tempfile import zipfile +from nova.common import cfg from nova import context from nova import crypto from nova import db @@ -39,16 +40,20 @@ from nova.api.ec2 import cloud from nova.api.ec2 import ec2utils +cloudpipe_opts = [ + cfg.StrOpt('boot_script_template', + default=utils.abspath('cloudpipe/bootscript.template'), + help=_('Template for cloudpipe instance boot script')), + cfg.StrOpt('dmz_net', + default='10.0.0.0', + help=_('Network to push into openvpn config')), + cfg.StrOpt('dmz_mask', + default='255.255.255.0', + help=_('Netmask to push into openvpn config')), + ] + FLAGS = flags.FLAGS -flags.DEFINE_string('boot_script_template', - utils.abspath('cloudpipe/bootscript.template'), - _('Template for script to run on cloudpipe instance boot')) -flags.DEFINE_string('dmz_net', - '10.0.0.0', - _('Network to push into openvpn config')) -flags.DEFINE_string('dmz_mask', - '255.255.255.0', - _('Netmask to push into openvpn config')) +FLAGS.add_options(cloudpipe_opts) LOG = logging.getLogger('nova.cloudpipe') |