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
Add CaaS related network type queries
[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
eef17db
..
4bd9824
100644
(file)
--- a/
cmframework/src/cmframework/utils/cmansibleinventory.py
+++ b/
cmframework/src/cmframework/utils/cmansibleinventory.py
@@
-93,7
+93,7
@@
class AnsibleInventory(object):
def set_caas_master_data(self, hostvars, node, caasconf, hostsconf):
dns = hostvars[node]['ssl_alt_name']['dns']
def set_caas_master_data(self, hostvars, node, caasconf, hostsconf):
dns = hostvars[node]['ssl_alt_name']['dns']
- dns.append(
'kubernetes.default.svc.nokia.net'
)
+ dns.append(
caasconf.get_kubernetes_domain()
)
dns.append(caasconf.get_apiserver_in_hosts())
dns.append(caasconf.get_registry_url())
dns.append(caasconf.get_update_registry_url())
dns.append(caasconf.get_apiserver_in_hosts())
dns.append(caasconf.get_registry_url())
dns.append(caasconf.get_update_registry_url())
@@
-232,7
+232,7
@@
class AnsibleInventory(object):
plugins = self.pluginloader.get_plugin_instances(self.confman, inventory, ownhost)
if self._is_setup():
inventory.clear()
plugins = self.pluginloader.get_plugin_instances(self.confman, inventory, ownhost)
if self._is_setup():
inventory.clear()
- for name, plugin in
plugins.iteritems(
):
+ for name, plugin in
sorted(plugins.iteritems()
):
if self._is_bootstrapping():
plugin.handle_bootstrapping()
elif self._is_provisioning():
if self._is_bootstrapping():
plugin.handle_bootstrapping()
elif self._is_provisioning():