parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Update dnsmasq script to use YAML config

This commit is contained in:
Joshua Boniface 2019-03-17 13:57:09 -04:00
parent deb4247e25
commit 4050c452d6
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
node-daemon/pvcd/dnsmasq-zookeeper-leases.py
View File

@ -20,10 +20,10 @@
# #
############################################################################### ###############################################################################
import argparse import argparse
import configparser
import os, sys import os, sys
import kazoo.client import kazoo.client
import re import re
import yaml
# #
# Variables # Variables
@ -35,7 +35,8 @@ def get_zookeeper_key():
# Get the interface from environment (passed by dnsmasq) # Get the interface from environment (passed by dnsmasq)
try: try:
interface = os.environ['DNSMASQ_BRIDGE_INTERFACE'] interface = os.environ['DNSMASQ_BRIDGE_INTERFACE']
except: except Exception as e:
print('ERROR: DNSMASQ_BRIDGE_INTERFACE environment variable not found: {}'.format(e), file=sys.stderr)
exit(1) exit(1)
# Get the ID of the interface (the digits) # Get the ID of the interface (the digits)
network_vni = re.findall('\d+', interface)[0] network_vni = re.findall('\d+', interface)[0]
@ -63,23 +64,20 @@ def connect_zookeeper():
pvcd_config_file = os.environ['PVCD_CONFIG_FILE'] pvcd_config_file = os.environ['PVCD_CONFIG_FILE']
except: except:
# Default place # Default place
pvcd_config_file = '/etc/pvc/pvcd.conf' pvcd_config_file = '/etc/pvc/pvcd.yaml'
o_config = configparser.ConfigParser() with open(pvcd_config_file, 'r') as cfgfile:
o_config.read(pvcd_config_file)
try:
zk_host = o_config['default']['coordinators']
except:
try: try:
zk_host = o_config[socket.gethostname()]['coordinators'] o_config = yaml.load(cfgfile)
except: except Exception as e:
print('ERROR: Failed to parse configuration file: {}'.format(e), file=sys.stderr)
exit(1) exit(1)
zk_conn = kazoo.client.KazooClient(hosts=zk_host)
try: try:
zk_conn = kazoo.client.KazooClient(hosts=o_config['pvc']['cluster']['coordinators'])
zk_conn.start() zk_conn.start()
except: except Exception as e:
print('ERROR: Failed to connect to Zookeeper: {}'.format(e), file=sys.stderr)
exit(1) exit(1)
return zk_conn return zk_conn