Add gevent to node daemon

Required for the Metadata API instance.
Ensure args are checked against form body
2020-10-27 02:42:49 -04:00 · 2020-10-27 02:30:59 -04:00 · 2020-10-26 11:44:45 -04:00
3 changed files with 4 additions and 4 deletions
--- a/api-daemon/pvcapid/flaskapi.py
+++ b/api-daemon/pvcapid/flaskapi.py
@ -169,7 +169,7 @@ class RequestParser(object):
                    action=reqarg.get('action', None),
                    choices=reqarg.get('choices', ()),
                    help=reqarg.get('helptext', None),
-                    location='args'
+                    location=['args','form']
                )
            reqargs = parser.parse_args()
            kwargs['reqargs'] = reqargs
--- a/debian/control
+++ b/debian/control
@ -8,7 +8,7 @@ X-Python3-Version: >= 3.2

 Package: pvc-daemon-node
 Architecture: all
-Depends: systemd, pvc-daemon-common, python3-kazoo, python3-psutil, python3-apscheduler, python3-libvirt, python3-psycopg2, python3-dnspython, python3-yaml, python3-distutils, python3-rados, ipmitool, libvirt-daemon-system, arping, vlan, bridge-utils, dnsmasq, nftables, pdns-server, pdns-backend-pgsql
+Depends: systemd, pvc-daemon-common, python3-kazoo, python3-psutil, python3-apscheduler, python3-libvirt, python3-psycopg2, python3-dnspython, python3-yaml, python3-distutils, python3-rados, python3-gevent, ipmitool, libvirt-daemon-system, arping, vlan, bridge-utils, dnsmasq, nftables, pdns-server, pdns-backend-pgsql
 Suggests: pvc-client-api, pvc-client-cli
 Description: Parallel Virtual Cluster node daemon (Python 3)
 A KVM/Zookeeper/Ceph-based VM and private cloud manager
--- a/node-daemon/pvcnoded/fencing.py
+++ b/node-daemon/pvcnoded/fencing.py
@ -35,7 +35,7 @@ def fenceNode(node_name, zk_conn, config, logger):
    failcount = 0
    while failcount < failcount_limit:
        # Wait 5 seconds
-        time.sleep(config.keepalive_interval)
+        time.sleep(config['keepalive_interval'])
        # Get the state
        node_daemon_state = zkhandler.readdata(zk_conn, '/nodes/{}/daemonstate'.format(node_name))
        # Is it still 'dead'
@ -57,7 +57,7 @@ def fenceNode(node_name, zk_conn, config, logger):
    # Shoot it in the head
    fence_status = rebootViaIPMI(ipmi_hostname, ipmi_username, ipmi_password, logger)
    # Hold to ensure the fence takes effect and system stabilizes
-    time.sleep(config.keepalive_interval * 2)
+    time.sleep(config['keepalive_interval'] * 2)

    # Force into secondary network state if needed
    if node_name in config['coordinators']:
Author	SHA1	Message	Date
Joshua M. Boniface	d2c0d868c4	Add gevent to node daemon Required for the Metadata API instance.	2020-10-27 02:42:49 -04:00
Joshua M. Boniface	d63e757c32	Ensure args are checked against form body Required for XML definitions but erroneously removed during file parsing reworking.	2020-10-27 02:30:59 -04:00
Joshua M. Boniface	5d08ad9573	Fix incorrect keepalive interval setting	2020-10-26 11:44:45 -04:00