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

Only offer deployment if a candidate manager

Browse Source 
If candidate managers are defined, and this node is not in
that set, ignore PXE and SSDP requests to opt out of
deployment.
This commit is contained in:
Jarrod Johnson 2021-01-08 16:32:41 -05:00
parent 25c3f40559
commit fa1c2f5c1e
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
confluent_server/confluent/discovery/protocols/pxe.py
View File

@ -23,6 +23,8 @@
# option 97 = UUID (wireformat)
import confluent.config.configmanager as cfm
import confluent.collective.manager as collective
import confluent.noderange as noderange
import confluent.log as log
import confluent.netutil as netutil
import ctypes
@ -264,9 +266,7 @@ def proxydhcp():
if not myipn:
continue
if opts.get(77, None) == b'iPXE':
cfd = cfg.get_node_attributes(node, ('deployment.*'))
profile = cfd.get(node, {}).get(
'deployment.pendingprofile', {}).get('value', None)
profile = get_deployment_profile(node, cfg)
if not profile:
continue
myip = socket.inet_ntoa(myipn)
@ -428,17 +428,29 @@ def remap_nodes(nodeattribs, configmanager):
macmap[updates[node][attrib]['value'].lower()] = node
def get_deployment_profile(node, cfg):
cfd = cfg.get_node_attributes(node, ('deployment.*'))
profile = cfd.get(node, {}).get('deployment.pendingprofile', {}).get('value', None)
if not profile:
return None
candmgrs = cfd.get(node, {}).get('collective.managercandidates', {}).get('value', None)
if candmgrs:
candmgrs = noderange.NodeRange(candmgrs, cfg).nodes
if collective.get_myname() not in candmgrs:
return None
return profile
staticassigns = {}
myipbypeer = {}
def check_reply(node, info, packet, sock, cfg, reqview):
httpboot = info['architecture'] == 'uefi-httpboot'
replen = 275 # default is going to be 286
cfd = cfg.get_node_attributes(node, ('deployment.*'))
profile = cfd.get(node, {}).get('deployment.pendingprofile', {}).get('value', None)
myipn = info['netinfo']['recvip']
myipn = socket.inet_aton(myipn)
profile = get_deployment_profile(node, cfg)
if not profile:
return
myipn = info['netinfo']['recvip']
myipn = socket.inet_aton(myipn)
rqtype = packet[53][0]
insecuremode = cfd.get(node, {}).get('deployment.useinsecureprotocols',
{}).get('value', 'never')

9
confluent_server/confluent/discovery/protocols/ssdp.py
View File

@ -29,7 +29,9 @@
import confluent.config.configmanager as cfm
import confluent.collective.manager as collective
import confluent.neighutil as neighutil
import confluent.noderange as noderange
import confluent.util as util
import confluent.log as log
import confluent.netutil as netutil
@ -186,10 +188,15 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
# planned for
cfg = cfm.ConfigManager(None)
cfd = cfg.get_node_attributes(
node, 'deployment.pendingprofile')
node, ['deployment.pendingprofile', 'collective.managercandidates'])
if not cfd.get(node, {}).get(
'deployment.pendingprofile', {}).get('value', None):
break
candmgrs = cfd.get(node, {}).get('collective.managercandidates', {}).get('value', None)
if candmgrs:
candmgrs = noderange.NodeRange(candmgrs, cfg).nodes
if collective.get_myname() not in candmgrs:
break
currtime = time.time()
seconds = int(currtime)
msecs = int(currtime * 1000 % 1000)