xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Add facility to auto-exec nodeconfig on discovery

Browse Source 
This permits more open ended node configuration when discovery happens.
This commit is contained in:
Jarrod Johnson 2022-08-08 16:13:01 -04:00
parent 1125e4c712
commit f0c8eee956
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/config/attributes.py
View File

@ -247,6 +247,10 @@ node = {
'and any restrictions around reusing an old password.',
'validlistkeys': ('expiration', 'loginfailures', 'complexity', 'reuse'),
},
'discovery.nodeconfig': {
'description': 'Set of nodeconfig arguments to apply after automatic discovery'
},
'discovery.policy': {
'description': 'Policy to use for auto-configuration of discovered '
'and identified nodes. Valid values are "manual", '

11
confluent_server/confluent/discovery/core.py
View File

@ -81,7 +81,9 @@ import confluent.noderange as noderange
import confluent.util as util
import eventlet
import traceback
import shlex
import socket as nsocket
import eventlet.green.subprocess as subprocess
webclient = eventlet.import_patched('pyghmi.util.webclient')
@ -1180,6 +1182,10 @@ def discover_node(cfg, handler, info, nodename, manual):
nodename, str(e))})
traceback.print_exc()
return False
nodeconfig = cfg.get_node_attributes(nodename, 'discovery.nodeconfig')
nodeconfig = nodeconfig.get(nodename, {}).get('discovery.nodeconfig', {}).get('value', None)
if nodeconfig:
nodeconfig = shlex.split(nodeconfig)
newnodeattribs = {}
if list(cfm.list_collective()):
# We are in a collective, check collective.manager
@ -1202,6 +1208,11 @@ def discover_node(cfg, handler, info, nodename, manual):
cfg.set_node_attributes({nodename: newnodeattribs})
log.log({'info': 'Discovered {0} ({1})'.format(nodename,
handler.devname)})
if nodeconfig:
subprocess.check_call(['/opt/confluent/bin/nodeconfig', nodename] + nodeconfig)
log.log({'info': 'Configured {0} ({1})'.format(nodename,
handler.devname)})
info['discostatus'] = 'discovered'
for i in pending_by_uuid.get(curruuid, []):
eventlet.spawn_n(_recheck_single_unknown_info, cfg, i)