From d9cdd7a50dfa323b86cd1fdd153bbe37138c736e Mon Sep 17 00:00:00 2001 From: Christophe Varoqui Date: Tue, 13 Jun 2017 14:33:53 +0200 Subject: [PATCH] Add ordered nodes and drpnodes properties to the Svc class Those will be used by osvcd to give priorities to services nodes. --- lib/svc.py | 2 ++ lib/svcBuilder.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/svc.py b/lib/svc.py index 61b1058ca3..e644a03bbe 100644 --- a/lib/svc.py +++ b/lib/svc.py @@ -370,7 +370,9 @@ def __init__(self, svcname=None): self.show_disabled = False self.svc_env = rcEnv.node_env self.nodes = set([rcEnv.nodename]) + self.ordered_nodes = [rcEnv.nodename] self.drpnodes = set() + self.ordered_drpnodes = [] self.drpnode = "" self.encapnodes = set() self.flex_primary = "" diff --git a/lib/svcBuilder.py b/lib/svcBuilder.py index a224b3aba0..caf764eb5a 100644 --- a/lib/svcBuilder.py +++ b/lib/svcBuilder.py @@ -3078,6 +3078,7 @@ def build(name, minimal=False, svcconf=None): nodes = [n.lower() for n in svc.conf_get_string_scope('DEFAULT', "nodes").split() if n != ""] except ex.OptNotFound: nodes = [rcEnv.nodename] + svc.ordered_nodes = nodes svc.nodes = set(nodes) try: @@ -3091,6 +3092,7 @@ def build(name, minimal=False, svcconf=None): drpnodes.append(drpnode) except ex.OptNotFound: drpnode = '' + svc.ordered_drpnodes = drpnodes svc.drpnodes = set(drpnodes) try: