Support @drpnodes keywords scoping in cluster.conf

Scopes in cluster.conf were treated like scopes in any object, thus using DEFAULT.nodes and DEFAULT.drpnodes as reference. Scopes in cluster.conf must use cluster.nodes and cluster.drpnodes as reference instead.
opensvc · Nov 6, 2019 · 9510b45 · 9510b45
1 parent 76206fc
commit 9510b45
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/extconfig.py b/lib/extconfig.py
@@ -920,7 +920,17 @@ def conf_has_option_scoped(self, s, o, impersonate=None, cd=None, scope_order=No
         candidates = [
             (o+"@"+nodename, True),
         ]
-        if hasattr(self, "path"):
+        if not hasattr(self, "path"):
+            if o != "nodes":
+                candidates.append((o+"@nodes", nodename in self.cluster_nodes))
+            if o != "drpnodes":
+                candidates.append((o+"@drpnodes", nodename in self.cluster_drpnodes))
+        elif self.path == "cluster":
+            if o != "nodes":
+                candidates.append((o+"@nodes", nodename in self.node.cluster_nodes))
+            if o != "drpnodes":
+                candidates.append((o+"@drpnodes", nodename in self.node.cluster_drpnodes))
+        else:
             if o != "nodes":
                 candidates.append((o+"@nodes", nodename in self.nodes))
             if o != "drpnodes":
@@ -931,11 +941,6 @@ def conf_has_option_scoped(self, s, o, impersonate=None, cd=None, scope_order=No
                 candidates.append((o+"@flex_primary", nodename == self.flex_primary))
             if o != "drp_flex_primary":
                 candidates.append((o+"@drp_flex_primary", nodename == self.drp_flex_primary))
-        else:
-            if o != "nodes":
-                candidates.append((o+"@nodes", nodename in self.cluster_nodes))
-            if o != "drpnodes":
-                candidates.append((o+"@drpnodes", nodename in self.cluster_drpnodes))
         candidates += [
             (o, True),
         ]