Revamp config parsing and imports
Brings sanity to the passing of the config variable around the various submodules for use in the ZKConnection decorator.
This commit is contained in:
parent
4554a0d6af
commit
c6bececb55
|
@ -19,17 +19,95 @@
|
||||||
#
|
#
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import pvcapid.flaskapi as pvc_api
|
import os
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
from distutils.util import strtobool as dustrtobool
|
||||||
|
|
||||||
|
# Version string for startup output
|
||||||
|
version = '0.9.18'
|
||||||
|
|
||||||
|
|
||||||
|
##########################################################
|
||||||
|
# Helper Functions
|
||||||
|
##########################################################
|
||||||
|
|
||||||
|
def strtobool(stringv):
|
||||||
|
if stringv is None:
|
||||||
|
return False
|
||||||
|
if isinstance(stringv, bool):
|
||||||
|
return bool(stringv)
|
||||||
|
try:
|
||||||
|
return bool(dustrtobool(stringv))
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
##########################################################
|
||||||
|
# Configuration Parsing
|
||||||
|
##########################################################
|
||||||
|
|
||||||
|
# Parse the configuration file
|
||||||
|
try:
|
||||||
|
pvcapid_config_file = os.environ['PVC_CONFIG_FILE']
|
||||||
|
except Exception:
|
||||||
|
print('Error: The "PVC_CONFIG_FILE" environment variable must be set before starting pvcapid.')
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
print('Loading configuration from file "{}"'.format(pvcapid_config_file))
|
||||||
|
|
||||||
|
# Read in the config
|
||||||
|
try:
|
||||||
|
with open(pvcapid_config_file, 'r') as cfgfile:
|
||||||
|
o_config = yaml.load(cfgfile, Loader=yaml.BaseLoader)
|
||||||
|
except Exception as e:
|
||||||
|
print('ERROR: Failed to parse configuration file: {}'.format(e))
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Create the config object
|
||||||
|
config = {
|
||||||
|
'debug': strtobool(o_config['pvc']['debug']),
|
||||||
|
'coordinators': o_config['pvc']['coordinators'],
|
||||||
|
'listen_address': o_config['pvc']['api']['listen_address'],
|
||||||
|
'listen_port': int(o_config['pvc']['api']['listen_port']),
|
||||||
|
'auth_enabled': strtobool(o_config['pvc']['api']['authentication']['enabled']),
|
||||||
|
'auth_secret_key': o_config['pvc']['api']['authentication']['secret_key'],
|
||||||
|
'auth_tokens': o_config['pvc']['api']['authentication']['tokens'],
|
||||||
|
'ssl_enabled': strtobool(o_config['pvc']['api']['ssl']['enabled']),
|
||||||
|
'ssl_key_file': o_config['pvc']['api']['ssl']['key_file'],
|
||||||
|
'ssl_cert_file': o_config['pvc']['api']['ssl']['cert_file'],
|
||||||
|
'database_host': o_config['pvc']['provisioner']['database']['host'],
|
||||||
|
'database_port': int(o_config['pvc']['provisioner']['database']['port']),
|
||||||
|
'database_name': o_config['pvc']['provisioner']['database']['name'],
|
||||||
|
'database_user': o_config['pvc']['provisioner']['database']['user'],
|
||||||
|
'database_password': o_config['pvc']['provisioner']['database']['pass'],
|
||||||
|
'queue_host': o_config['pvc']['provisioner']['queue']['host'],
|
||||||
|
'queue_port': o_config['pvc']['provisioner']['queue']['port'],
|
||||||
|
'queue_path': o_config['pvc']['provisioner']['queue']['path'],
|
||||||
|
'storage_hosts': o_config['pvc']['provisioner']['ceph_cluster']['storage_hosts'],
|
||||||
|
'storage_domain': o_config['pvc']['provisioner']['ceph_cluster']['storage_domain'],
|
||||||
|
'ceph_monitor_port': o_config['pvc']['provisioner']['ceph_cluster']['ceph_monitor_port'],
|
||||||
|
'ceph_storage_secret_uuid': o_config['pvc']['provisioner']['ceph_cluster']['ceph_storage_secret_uuid']
|
||||||
|
}
|
||||||
|
|
||||||
|
# Use coordinators as storage hosts if not explicitly specified
|
||||||
|
if not config['storage_hosts']:
|
||||||
|
config['storage_hosts'] = config['coordinators']
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print('ERROR: Failed to load configuration: {}'.format(e))
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
##########################################################
|
##########################################################
|
||||||
# Entrypoint
|
# Entrypoint
|
||||||
##########################################################
|
##########################################################
|
||||||
|
|
||||||
# Version string for startup output
|
import pvcapid.flaskapi as pvc_api # noqa: E402
|
||||||
version = '0.9.18'
|
|
||||||
|
|
||||||
if pvc_api.config['ssl_enabled']:
|
if config['ssl_enabled']:
|
||||||
context = (pvc_api.config['ssl_cert_file'], pvc_api.config['ssl_key_file'])
|
context = (config['ssl_cert_file'], config['ssl_key_file'])
|
||||||
else:
|
else:
|
||||||
context = None
|
context = None
|
||||||
|
|
||||||
|
@ -46,10 +124,10 @@ print('| ## ### ###### |')
|
||||||
print('|--------------------------------------------------|')
|
print('|--------------------------------------------------|')
|
||||||
print('| Parallel Virtual Cluster API daemon v{0: <11} |'.format(version))
|
print('| Parallel Virtual Cluster API daemon v{0: <11} |'.format(version))
|
||||||
print('| API version: v{0: <34} |'.format(pvc_api.API_VERSION))
|
print('| API version: v{0: <34} |'.format(pvc_api.API_VERSION))
|
||||||
print('| Listen: {0: <40} |'.format('{}:{}'.format(pvc_api.config['listen_address'], pvc_api.config['listen_port'])))
|
print('| Listen: {0: <40} |'.format('{}:{}'.format(config['listen_address'], config['listen_port'])))
|
||||||
print('| SSL: {0: <43} |'.format(str(pvc_api.config['ssl_enabled'])))
|
print('| SSL: {0: <43} |'.format(str(config['ssl_enabled'])))
|
||||||
print('| Authentication: {0: <32} |'.format(str(pvc_api.config['auth_enabled'])))
|
print('| Authentication: {0: <32} |'.format(str(config['auth_enabled'])))
|
||||||
print('|--------------------------------------------------|')
|
print('|--------------------------------------------------|')
|
||||||
print('')
|
print('')
|
||||||
|
|
||||||
pvc_api.app.run(pvc_api.config['listen_address'], pvc_api.config['listen_port'], threaded=True, ssl_context=context)
|
pvc_api.app.run(config['listen_address'], config['listen_port'], threaded=True, ssl_context=context)
|
||||||
|
|
|
@ -22,24 +22,11 @@
|
||||||
import psycopg2
|
import psycopg2
|
||||||
import psycopg2.extras
|
import psycopg2.extras
|
||||||
|
|
||||||
from distutils.util import strtobool as dustrtobool
|
from pvcapid.Daemon import config
|
||||||
|
|
||||||
import daemon_lib.common as pvc_common
|
import daemon_lib.common as pvc_common
|
||||||
import daemon_lib.ceph as pvc_ceph
|
import daemon_lib.ceph as pvc_ceph
|
||||||
|
|
||||||
config = None # Set in this namespace by flaskapi
|
|
||||||
|
|
||||||
|
|
||||||
def strtobool(stringv):
|
|
||||||
if stringv is None:
|
|
||||||
return False
|
|
||||||
if isinstance(stringv, bool):
|
|
||||||
return bool(stringv)
|
|
||||||
try:
|
|
||||||
return bool(dustrtobool(stringv))
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Exceptions (used by Celery tasks)
|
# Exceptions (used by Celery tasks)
|
||||||
|
|
|
@ -19,15 +19,14 @@
|
||||||
#
|
#
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import yaml
|
|
||||||
import os
|
|
||||||
import flask
|
import flask
|
||||||
|
|
||||||
from distutils.util import strtobool as dustrtobool
|
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from flask_restful import Resource, Api, reqparse, abort
|
from flask_restful import Resource, Api, reqparse, abort
|
||||||
from celery import Celery
|
from celery import Celery
|
||||||
|
|
||||||
|
from pvcapid.Daemon import config, strtobool
|
||||||
|
|
||||||
import pvcapid.helper as api_helper
|
import pvcapid.helper as api_helper
|
||||||
import pvcapid.provisioner as api_provisioner
|
import pvcapid.provisioner as api_provisioner
|
||||||
import pvcapid.benchmark as api_benchmark
|
import pvcapid.benchmark as api_benchmark
|
||||||
|
@ -35,80 +34,10 @@ import pvcapid.ova as api_ova
|
||||||
|
|
||||||
from flask_sqlalchemy import SQLAlchemy
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
|
|
||||||
|
# API version
|
||||||
API_VERSION = 1.0
|
API_VERSION = 1.0
|
||||||
|
|
||||||
|
|
||||||
def strtobool(stringv):
|
|
||||||
if stringv is None:
|
|
||||||
return False
|
|
||||||
if isinstance(stringv, bool):
|
|
||||||
return bool(stringv)
|
|
||||||
try:
|
|
||||||
return bool(dustrtobool(stringv))
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
# Parse the configuration file
|
|
||||||
try:
|
|
||||||
pvcapid_config_file = os.environ['PVC_CONFIG_FILE']
|
|
||||||
except Exception:
|
|
||||||
print('Error: The "PVC_CONFIG_FILE" environment variable must be set before starting pvcapid.')
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
print('Loading configuration from file "{}"'.format(pvcapid_config_file))
|
|
||||||
|
|
||||||
# Read in the config
|
|
||||||
try:
|
|
||||||
with open(pvcapid_config_file, 'r') as cfgfile:
|
|
||||||
o_config = yaml.load(cfgfile, Loader=yaml.BaseLoader)
|
|
||||||
except Exception as e:
|
|
||||||
print('ERROR: Failed to parse configuration file: {}'.format(e))
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Create the config object
|
|
||||||
config = {
|
|
||||||
'debug': strtobool(o_config['pvc']['debug']),
|
|
||||||
'coordinators': o_config['pvc']['coordinators'],
|
|
||||||
'listen_address': o_config['pvc']['api']['listen_address'],
|
|
||||||
'listen_port': int(o_config['pvc']['api']['listen_port']),
|
|
||||||
'auth_enabled': strtobool(o_config['pvc']['api']['authentication']['enabled']),
|
|
||||||
'auth_secret_key': o_config['pvc']['api']['authentication']['secret_key'],
|
|
||||||
'auth_tokens': o_config['pvc']['api']['authentication']['tokens'],
|
|
||||||
'ssl_enabled': strtobool(o_config['pvc']['api']['ssl']['enabled']),
|
|
||||||
'ssl_key_file': o_config['pvc']['api']['ssl']['key_file'],
|
|
||||||
'ssl_cert_file': o_config['pvc']['api']['ssl']['cert_file'],
|
|
||||||
'database_host': o_config['pvc']['provisioner']['database']['host'],
|
|
||||||
'database_port': int(o_config['pvc']['provisioner']['database']['port']),
|
|
||||||
'database_name': o_config['pvc']['provisioner']['database']['name'],
|
|
||||||
'database_user': o_config['pvc']['provisioner']['database']['user'],
|
|
||||||
'database_password': o_config['pvc']['provisioner']['database']['pass'],
|
|
||||||
'queue_host': o_config['pvc']['provisioner']['queue']['host'],
|
|
||||||
'queue_port': o_config['pvc']['provisioner']['queue']['port'],
|
|
||||||
'queue_path': o_config['pvc']['provisioner']['queue']['path'],
|
|
||||||
'storage_hosts': o_config['pvc']['provisioner']['ceph_cluster']['storage_hosts'],
|
|
||||||
'storage_domain': o_config['pvc']['provisioner']['ceph_cluster']['storage_domain'],
|
|
||||||
'ceph_monitor_port': o_config['pvc']['provisioner']['ceph_cluster']['ceph_monitor_port'],
|
|
||||||
'ceph_storage_secret_uuid': o_config['pvc']['provisioner']['ceph_cluster']['ceph_storage_secret_uuid']
|
|
||||||
}
|
|
||||||
|
|
||||||
# Use coordinators as storage hosts if not explicitly specified
|
|
||||||
if not config['storage_hosts']:
|
|
||||||
config['storage_hosts'] = config['coordinators']
|
|
||||||
|
|
||||||
# Set the config object in the api_helper namespace
|
|
||||||
api_helper.config = config
|
|
||||||
# Set the config object in the api_provisioner namespace
|
|
||||||
api_provisioner.config = config
|
|
||||||
# Set the config object in the api_benchmark namespace
|
|
||||||
api_benchmark.config = config
|
|
||||||
# Set the config object in the api_ova namespace
|
|
||||||
api_ova.config = config
|
|
||||||
except Exception as e:
|
|
||||||
print('ERROR: Failed to load configuration: {}'.format(e))
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
# Create Flask app and set config values
|
# Create Flask app and set config values
|
||||||
app = flask.Flask(__name__)
|
app = flask.Flask(__name__)
|
||||||
app.config['CELERY_BROKER_URL'] = 'redis://{}:{}{}'.format(config['queue_host'], config['queue_port'], config['queue_path'])
|
app.config['CELERY_BROKER_URL'] = 'redis://{}:{}{}'.format(config['queue_host'], config['queue_port'], config['queue_path'])
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -30,13 +30,13 @@ import lxml.etree
|
||||||
|
|
||||||
from werkzeug.formparser import parse_form_data
|
from werkzeug.formparser import parse_form_data
|
||||||
|
|
||||||
|
from pvcapid.Daemon import config
|
||||||
|
|
||||||
import daemon_lib.common as pvc_common
|
import daemon_lib.common as pvc_common
|
||||||
import daemon_lib.ceph as pvc_ceph
|
import daemon_lib.ceph as pvc_ceph
|
||||||
|
|
||||||
import pvcapid.provisioner as provisioner
|
import pvcapid.provisioner as provisioner
|
||||||
|
|
||||||
config = None # Set in this namespace by flaskapi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Common functions
|
# Common functions
|
||||||
|
|
|
@ -24,7 +24,7 @@ import psycopg2
|
||||||
import psycopg2.extras
|
import psycopg2.extras
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from distutils.util import strtobool as dustrtobool
|
from pvcapid.Daemon import config, strtobool
|
||||||
|
|
||||||
import daemon_lib.common as pvc_common
|
import daemon_lib.common as pvc_common
|
||||||
import daemon_lib.node as pvc_node
|
import daemon_lib.node as pvc_node
|
||||||
|
@ -36,19 +36,6 @@ import pvcapid.libvirt_schema as libvirt_schema
|
||||||
|
|
||||||
from pvcapid.ova import list_ova
|
from pvcapid.ova import list_ova
|
||||||
|
|
||||||
config = None # Set in this namespace by flaskapi
|
|
||||||
|
|
||||||
|
|
||||||
def strtobool(stringv):
|
|
||||||
if stringv is None:
|
|
||||||
return False
|
|
||||||
if isinstance(stringv, bool):
|
|
||||||
return bool(stringv)
|
|
||||||
try:
|
|
||||||
return bool(dustrtobool(stringv))
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Exceptions (used by Celery tasks)
|
# Exceptions (used by Celery tasks)
|
||||||
|
|
Loading…
Reference in New Issue