Code Review
/
ta
/
config-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kubenretes node role added to inventory.
[ta/config-manager.git]
/
cmdatahandlers
/
src
/
cmdatahandlers
/
hosts
/
config.py
diff --git
a/cmdatahandlers/src/cmdatahandlers/hosts/config.py
b/cmdatahandlers/src/cmdatahandlers/hosts/config.py
index
1bd37d8
..
6f3deb8
100644
(file)
--- 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):
return sorted(self.config[self.ROOT].keys())
def get_labels(self, hostname):
- noderole_label = "node-role.kubernetes.io/{}".format(self.get_noderole(hostname))
mandatory_labels = \
{"nodetype": self.get_nodetype(hostname),
"nodeindex": self.get_nodeindex(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)
labels = self.config[self.ROOT][hostname].get('labels', {}).copy()
labels.update(mandatory_labels)