Lint: E122 continuation line missing indentation or outdented
This commit is contained in:
parent
7932be3948
commit
e553c5d42a
|
@ -644,7 +644,7 @@ if zk_conn.exists('/nodes/{}'.format(myhostname)):
|
|||
'/nodes/{}/daemonstate'.format(myhostname): 'init',
|
||||
'/nodes/{}/routerstate'.format(myhostname): init_routerstate,
|
||||
'/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/{}/ipmiusername'.format(myhostname): config['ipmi_username'],
|
||||
'/nodes/{}/ipmipassword'.format(myhostname): config['ipmi_password']
|
||||
|
@ -654,7 +654,7 @@ else:
|
|||
keepalive_time = int(time.time())
|
||||
zkhandler.writedata(zk_conn, {
|
||||
'/nodes/{}'.format(myhostname): config['daemon_mode'],
|
||||
# Basic state information
|
||||
# Basic state information
|
||||
'/nodes/{}/daemonmode'.format(myhostname): config['daemon_mode'],
|
||||
'/nodes/{}/daemonstate'.format(myhostname): 'init',
|
||||
'/nodes/{}/routerstate'.format(myhostname): 'client',
|
||||
|
@ -670,7 +670,7 @@ else:
|
|||
'/nodes/{}/networkscount'.format(myhostname): '0',
|
||||
'/nodes/{}/domainscount'.format(myhostname): '0',
|
||||
'/nodes/{}/runningdomains'.format(myhostname): '',
|
||||
# Keepalives and fencing information
|
||||
# Keepalives and fencing information
|
||||
'/nodes/{}/keepalive'.format(myhostname): str(keepalive_time),
|
||||
'/nodes/{}/ipmihostname'.format(myhostname): config['ipmi_hostname'],
|
||||
'/nodes/{}/ipmiusername'.format(myhostname): config['ipmi_username'],
|
||||
|
|
|
@ -662,11 +662,11 @@ class VMInstance(object):
|
|||
|
||||
# Conditional pass one - Are we already performing an action
|
||||
if self.instart is False \
|
||||
and self.inrestart is False \
|
||||
and self.inmigrate is False \
|
||||
and self.inreceive is False \
|
||||
and self.inshutdown is False \
|
||||
and self.instop is False:
|
||||
and self.inrestart is False \
|
||||
and self.inmigrate is False \
|
||||
and self.inreceive is False \
|
||||
and self.inshutdown is False \
|
||||
and self.instop is False:
|
||||
# Conditional pass two - Is this VM configured to run on this node
|
||||
if self.node == self.this_node.name:
|
||||
# Conditional pass three - Is this VM currently running on this node
|
||||
|
|
Loading…
Reference in New Issue