vitalif
/
onedns
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

add required domain argument to onedns command

master
Justin Riley 2016-07-14 22:32:57 -04:00
parent 89bf167c76
commit ad61c4d4b4
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
onedns/cli.py
View File

@ -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()

3
onedns/clients/skydns.py
View File

@ -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):

4
onedns/monitor.py
View File

@ -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():