add required domain argument to onedns command
parent
89bf167c76
commit
ad61c4d4b4
|
@ -22,12 +22,14 @@ def main():
|
||||||
help='etcd port to connect to')
|
help='etcd port to connect to')
|
||||||
parser.add_argument('--etcd-cert', required=False, type=int,
|
parser.add_argument('--etcd-cert', required=False, type=int,
|
||||||
help='path to etcd client ssl cert')
|
help='path to etcd client ssl cert')
|
||||||
|
parser.add_argument('domain', help='DNS domain to use')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
logger.configure_onedns_logging(debug=args.debug)
|
logger.configure_onedns_logging(debug=args.debug)
|
||||||
args_dict = vars(args)
|
args_dict = vars(args)
|
||||||
one_args = dict((i.replace('one_', ''), args_dict[i]) for i in args_dict.keys() if
|
one_args = dict((i.replace('one_', ''), args_dict[i])
|
||||||
i.startswith('one_'))
|
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
|
etcd_args = dict((i.replace('etcd_', ''), args_dict[i])
|
||||||
i.startswith('etcd_'))
|
for i in args_dict.keys() if i.startswith('etcd_'))
|
||||||
mon = monitor.OneMonitor(one_kwargs=one_args, etcd_kwargs=etcd_args)
|
mon = monitor.OneMonitor(args.domain, one_kwargs=one_args,
|
||||||
|
etcd_kwargs=etcd_args)
|
||||||
mon.run()
|
mon.run()
|
||||||
|
|
|
@ -7,7 +7,8 @@ RE_VALIDNAME = re.compile('[^\w\d.-]')
|
||||||
|
|
||||||
|
|
||||||
class SkyDNSClient(object):
|
class SkyDNSClient(object):
|
||||||
def __init__(self, etcd_kwargs={}):
|
def __init__(self, domain, etcd_kwargs={}):
|
||||||
|
self.domain = domain
|
||||||
self._etcd = etcd.Client(**etcd_kwargs)
|
self._etcd = etcd.Client(**etcd_kwargs)
|
||||||
|
|
||||||
def register(self, vm):
|
def register(self, vm):
|
||||||
|
|
|
@ -9,9 +9,9 @@ class OneMonitor(object):
|
||||||
Reads events from OpenNebula and activates/deactivates VM domain names
|
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._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):
|
def update(self):
|
||||||
for vm in self._one.vms():
|
for vm in self._one.vms():
|
||||||
|
|
Loading…
Reference in New Issue