From ad61c4d4b40e25ea3860116329e79b4dedf1f977 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Thu, 14 Jul 2016 22:32:57 -0400 Subject: [PATCH] add required domain argument to onedns command --- onedns/cli.py | 12 +++++++----- onedns/clients/skydns.py | 3 ++- onedns/monitor.py | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/onedns/cli.py b/onedns/cli.py index d6e5d8b..1709b26 100644 --- a/onedns/cli.py +++ b/onedns/cli.py @@ -22,12 +22,14 @@ def main(): help='etcd port to connect to') parser.add_argument('--etcd-cert', required=False, type=int, help='path to etcd client ssl cert') + parser.add_argument('domain', help='DNS domain to use') args = parser.parse_args() logger.configure_onedns_logging(debug=args.debug) args_dict = vars(args) - one_args = dict((i.replace('one_', ''), args_dict[i]) for i in args_dict.keys() if - i.startswith('one_')) - etcd_args = dict((i.replace('etcd_', ''), args_dict[i]) for i in args_dict.keys() if - i.startswith('etcd_')) - mon = monitor.OneMonitor(one_kwargs=one_args, etcd_kwargs=etcd_args) + one_args = dict((i.replace('one_', ''), args_dict[i]) + for i in args_dict.keys() if i.startswith('one_')) + etcd_args = dict((i.replace('etcd_', ''), args_dict[i]) + for i in args_dict.keys() if i.startswith('etcd_')) + mon = monitor.OneMonitor(args.domain, one_kwargs=one_args, + etcd_kwargs=etcd_args) mon.run() diff --git a/onedns/clients/skydns.py b/onedns/clients/skydns.py index 83cd1c5..87fcde1 100644 --- a/onedns/clients/skydns.py +++ b/onedns/clients/skydns.py @@ -7,7 +7,8 @@ RE_VALIDNAME = re.compile('[^\w\d.-]') class SkyDNSClient(object): - def __init__(self, etcd_kwargs={}): + def __init__(self, domain, etcd_kwargs={}): + self.domain = domain self._etcd = etcd.Client(**etcd_kwargs) def register(self, vm): diff --git a/onedns/monitor.py b/onedns/monitor.py index 41ff590..46bb491 100644 --- a/onedns/monitor.py +++ b/onedns/monitor.py @@ -9,9 +9,9 @@ class OneMonitor(object): Reads events from OpenNebula and activates/deactivates VM domain names ''' - def __init__(self, one_kwargs={}, etcd_kwargs={}): + def __init__(self, domain, one_kwargs={}, etcd_kwargs={}): self._one = one.OneClient(**one_kwargs) - self._skydns = skydns.SkyDNSClient(etcd_kwargs=etcd_kwargs) + self._skydns = skydns.SkyDNSClient(domain, etcd_kwargs=etcd_kwargs) def update(self): for vm in self._one.vms():