Skip to content
Permalink
Browse files

Honor the nodes@encapnodes keyword value when set

Instead of always forcing to the value of encapnodes.
If not set, default to the encap nodename instead of all encapnodes.

If a encap cluster should be assembled, let the user set that explicitely.
  • Loading branch information...
cvaroqui committed Jul 15, 2019
1 parent 37ce5be commit 118927e9a4be51dfe061ac5b420f304af4b910fe
Showing with 4 additions and 7 deletions.
  1. +4 −7 lib/svc.py
@@ -556,13 +556,10 @@ def init_nodes(self):
except (AttributeError, ValueError):
ordered_encapnodes = []
self.encapnodes = set()
if self.encap:
self.ordered_nodes = ordered_encapnodes
else:
try:
self.ordered_nodes = self.oget("DEFAULT", "nodes")
except (AttributeError, ValueError):
self.ordered_nodes = [rcEnv.nodename]
try:
self.ordered_nodes = self.oget("DEFAULT", "nodes")
except (AttributeError, ValueError):
self.ordered_nodes = [rcEnv.nodename]
try:
self.ordered_drpnodes = self.oget("DEFAULT", "drpnodes")
except (AttributeError, ValueError):

0 comments on commit 118927e

Please sign in to comment.
You can’t perform that action at this time.