xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-19 03:55:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from zhougj4/master

Browse Source 
[merge-LXCA] pull request
This commit is contained in:
Jarrod Johnson 2021-05-27 09:54:44 -04:00 committed by GitHub
commit deb2b98e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/messages.py
View File

@ -199,6 +199,8 @@ class ConfluentMessage(object):
notes.append('Broken because of %s' % val['broken'])
elif val is not None and 'expression' in val:
value = val['expression']
elif isinstance(val, dict):
value = _htmlify_structure(val)
if value is None:
value = ''
if val is not None and value == '' and 'isset' in val and val[
@ -298,6 +300,7 @@ class DeletedResource(ConfluentMessage):
notnode = True
def __init__(self, resource):
self.myargs = [resource]
self.desc = 'Delete Resource'
self.kvpairs = {'deleted': resource}
def strip_node(self, node):
@ -310,6 +313,7 @@ class CreatedResource(ConfluentMessage):
def __init__(self, resource):
self.myargs = [resource]
self.desc = 'Create Resource'
self.kvpairs = {'created': resource}
def strip_node(self, node):

2
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@ -1368,7 +1368,7 @@ class IpmiHandler(object):
oldpower = self.ipmicmd.get_power()
if 'powerstate' in oldpower:
oldpower = oldpower['powerstate']
self.ipmicmd.set_power(powerstate, wait=30)
self.ipmicmd.set_power(powerstate, wait=True)
if powerstate == 'boot' and oldpower == 'on':
power = {'powerstate': 'reset'}
else: