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
Kubernetes node role refactored.
[ta/config-manager.git]
/
cmframework
/
src
/
cmframework
/
utils
/
cmansibleinventory.py
diff --git
a/cmframework/src/cmframework/utils/cmansibleinventory.py
b/cmframework/src/cmframework/utils/cmansibleinventory.py
index
a940f78
..
bf2e66f
100644
(file)
--- a/
cmframework/src/cmframework/utils/cmansibleinventory.py
+++ b/
cmframework/src/cmframework/utils/cmansibleinventory.py
@@
-79,11
+79,6
@@
class AnsibleInventory(object):
hostvars[node]['nodetype'] = hostsconf.get_nodetype(node)
hostvars[node]['nodeindex'] = hostsconf.get_nodeindex(node)
hostvars[node]['nodename'] = hostsconf.get_nodename(node)
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:
hostvars[node]['labels'] = host_labels
host_labels = hostsconf.get_labels(node)
if host_labels:
hostvars[node]['labels'] = host_labels