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

Change some settings regarding config file

Browse Source
This commit is contained in:
Joshua Boniface
2018-06-11 01:36:07 -04:00
parent 8a1bc46bf0
commit e08b7516b4
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pvcd.py
View File

@@ -39,9 +39,9 @@ print(ansiiprint.bold() + "pvcd - Parallel Virtual Cluster management daemon" +
# Get the config file variable from the environment # Get the config file variable from the environment
try: try:
pvcd_config_file = os.environ['PVC_CONFIG_FILE'] pvcd_config_file = os.environ['PVCD_CONFIG_FILE']
except: except:
print('ERROR: The "PVC_CONFIG_FILE" environment variable must be set before starting pvcd.') print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcd.')
exit(1) exit(1)
print('Loading configuration from file {}'.format(pvcd_config_file)) print('Loading configuration from file {}'.format(pvcd_config_file))
@@ -49,9 +49,6 @@ print('Loading configuration from file {}'.format(pvcd_config_file))
myhostname = socket.gethostname() myhostname = socket.gethostname()
myshorthostname = myhostname.split('.', 1)[0] myshorthostname = myhostname.split('.', 1)[0]
mydomainname = ''.join(myhostname.split('.', 1)[1:]) mydomainname = ''.join(myhostname.split('.', 1)[1:])
print(myhostname)
print(myshorthostname)
print(mydomainname)
# Config values dictionary # Config values dictionary
config_values = [ config_values = [
@@ -69,13 +66,21 @@ def readConfig(pvcd_config_file, myhostname):
try: try:
entries = o_config[myhostname] entries = o_config[myhostname]
except: except:
try:
entries = o_config['default'] entries = o_config['default']
except:
print('ERROR: Config file is not valid!')
exit(1)
for entry in config_values: for entry in config_values:
try: try:
config[entry] = entries[entry] config[entry] = entries[entry]
except: except:
try:
config[entry] = o_config['default'][entry] config[entry] = o_config['default'][entry]
except:
print('ERROR: Config file missing required value "{}" for this host!'.format(entry))
exit(1)
# Handle an empty ipmi_hostname # Handle an empty ipmi_hostname
if config['ipmi_hostname'] == '': if config['ipmi_hostname'] == '':