From e6ced6ae49adb3f8a0d4a9051e8364265aabda4b Mon Sep 17 00:00:00 2001 From: Balazs Szekeres Date: Tue, 8 Oct 2019 08:48:45 +0200 Subject: [PATCH] Kubenretes node role added to inventory. Change-Id: I8aafd748de9bb110aab4eaa1105d4a283077fa11 Signed-off-by: Balazs Szekeres --- cmdatahandlers/src/cmdatahandlers/hosts/config.py | 4 +--- cmframework/src/cmframework/utils/cmansibleinventory.py | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmdatahandlers/src/cmdatahandlers/hosts/config.py b/cmdatahandlers/src/cmdatahandlers/hosts/config.py index 06f556f..6f3deb8 100644 --- a/cmdatahandlers/src/cmdatahandlers/hosts/config.py +++ b/cmdatahandlers/src/cmdatahandlers/hosts/config.py @@ -168,12 +168,10 @@ class Config(config.Config): return sorted(self.config[self.ROOT].keys()) def get_labels(self, hostname): - noderole_label = "node.kubernetes.io/{}".format(self.get_noderole(hostname)) mandatory_labels = \ {"nodetype": self.get_nodetype(hostname), "nodeindex": self.get_nodeindex(hostname), - "nodename": self.get_nodename(hostname), - noderole_label: ""} + "nodename": self.get_nodename(hostname)} labels = self.config[self.ROOT][hostname].get('labels', {}).copy() labels.update(mandatory_labels) diff --git a/cmframework/src/cmframework/utils/cmansibleinventory.py b/cmframework/src/cmframework/utils/cmansibleinventory.py index f21fa0b..a940f78 100644 --- a/cmframework/src/cmframework/utils/cmansibleinventory.py +++ b/cmframework/src/cmframework/utils/cmansibleinventory.py @@ -79,6 +79,10 @@ class AnsibleInventory(object): hostvars[node]['nodetype'] = hostsconf.get_nodetype(node) hostvars[node]['nodeindex'] = hostsconf.get_nodeindex(node) hostvars[node]['nodename'] = hostsconf.get_nodename(node) + if hostsconf.get_nodetype(node) == "caas-master": + hostvars[node]['noderole'] = "master" + elif hostsconf.get_nodetype(node) == "caas-worker": + hostvars[node]['noderole'] = "worker" host_labels = hostsconf.get_labels(node) if host_labels: -- 2.16.6