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

Lint: E122 continuation line missing indentation or outdented

Browse Source
This commit is contained in:
Joshua Boniface
2020-11-07 13:12:26 -05:00
parent 7932be3948
commit e553c5d42a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node-daemon/pvcnoded/Daemon.py
View File

@@ -644,7 +644,7 @@ if zk_conn.exists('/nodes/{}'.format(myhostname)):
'/nodes/{}/daemonstate'.format(myhostname): 'init', '/nodes/{}/daemonstate'.format(myhostname): 'init',
'/nodes/{}/routerstate'.format(myhostname): init_routerstate, '/nodes/{}/routerstate'.format(myhostname): init_routerstate,
'/nodes/{}/staticdata'.format(myhostname): ' '.join(staticdata), '/nodes/{}/staticdata'.format(myhostname): ' '.join(staticdata),
# Keepalives and fencing information (always load and set from config on boot) # Keepalives and fencing information (always load and set from config on boot)
'/nodes/{}/ipmihostname'.format(myhostname): config['ipmi_hostname'], '/nodes/{}/ipmihostname'.format(myhostname): config['ipmi_hostname'],
'/nodes/{}/ipmiusername'.format(myhostname): config['ipmi_username'], '/nodes/{}/ipmiusername'.format(myhostname): config['ipmi_username'],
'/nodes/{}/ipmipassword'.format(myhostname): config['ipmi_password'] '/nodes/{}/ipmipassword'.format(myhostname): config['ipmi_password']
@@ -654,7 +654,7 @@ else:
keepalive_time = int(time.time()) keepalive_time = int(time.time())
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {
'/nodes/{}'.format(myhostname): config['daemon_mode'], '/nodes/{}'.format(myhostname): config['daemon_mode'],
# Basic state information # Basic state information
'/nodes/{}/daemonmode'.format(myhostname): config['daemon_mode'], '/nodes/{}/daemonmode'.format(myhostname): config['daemon_mode'],
'/nodes/{}/daemonstate'.format(myhostname): 'init', '/nodes/{}/daemonstate'.format(myhostname): 'init',
'/nodes/{}/routerstate'.format(myhostname): 'client', '/nodes/{}/routerstate'.format(myhostname): 'client',
@@ -670,7 +670,7 @@ else:
'/nodes/{}/networkscount'.format(myhostname): '0', '/nodes/{}/networkscount'.format(myhostname): '0',
'/nodes/{}/domainscount'.format(myhostname): '0', '/nodes/{}/domainscount'.format(myhostname): '0',
'/nodes/{}/runningdomains'.format(myhostname): '', '/nodes/{}/runningdomains'.format(myhostname): '',
# Keepalives and fencing information # Keepalives and fencing information
'/nodes/{}/keepalive'.format(myhostname): str(keepalive_time), '/nodes/{}/keepalive'.format(myhostname): str(keepalive_time),
'/nodes/{}/ipmihostname'.format(myhostname): config['ipmi_hostname'], '/nodes/{}/ipmihostname'.format(myhostname): config['ipmi_hostname'],
'/nodes/{}/ipmiusername'.format(myhostname): config['ipmi_username'], '/nodes/{}/ipmiusername'.format(myhostname): config['ipmi_username'],

10
node-daemon/pvcnoded/VMInstance.py
View File

@@ -662,11 +662,11 @@ class VMInstance(object):
# Conditional pass one - Are we already performing an action # Conditional pass one - Are we already performing an action
if self.instart is False \ if self.instart is False \
and self.inrestart is False \ and self.inrestart is False \
and self.inmigrate is False \ and self.inmigrate is False \
and self.inreceive is False \ and self.inreceive is False \
and self.inshutdown is False \ and self.inshutdown is False \
and self.instop is False: and self.instop is False:
# Conditional pass two - Is this VM configured to run on this node # Conditional pass two - Is this VM configured to run on this node
if self.node == self.this_node.name: if self.node == self.this_node.name:
# Conditional pass three - Is this VM currently running on this node # Conditional pass three - Is this VM currently running on this node