API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 31st, 2016
61
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.43 KB | None | 0 0
raw download clone embed print report
  1. diff --git lib/ansible/constants.py lib/ansible/constants.py
  2. index 7a4c9be..7cce06a 100644
  3. --- lib/ansible/constants.py
  4. +++ lib/ansible/constants.py
  5. @@ -83,7 +83,7 @@ def _get_config(p, section, key, env_var, default):
  6. return default
  7.  
  8. def load_config_file():
  9. - ''' Load Config File order(first found is used): ENV, CWD, HOME, /etc/ansible '''
  10. + ''' Load Config File order(first found is used): ENV, CWD, HOME, /usr/local/etc/ansible '''
  11.  
  12. p = configparser.ConfigParser()
  13.  
  14. @@ -94,7 +94,7 @@ def load_config_file():
  15. path0 += "/ansible.cfg"
  16. path1 = os.getcwd() + "/ansible.cfg"
  17. path2 = os.path.expanduser("~/.ansible.cfg")
  18. - path3 = "/etc/ansible/ansible.cfg"
  19. + path3 = "/usr/local/etc/ansible/ansible.cfg"
  20.  
  21. for path in [path0, path1, path2, path3]:
  22. if path is not None and os.path.exists(path):
  23. @@ -123,7 +123,7 @@ DEFAULTS='defaults'
  24. # FIXME: add deprecation warning when these get set
  25. #### DEPRECATED VARS ####
  26. # use more sanely named 'inventory'
  27. -DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/etc/ansible/hosts', ispath=True)
  28. +DEPRECATED_HOST_LIST = get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', '/usr/local/etc/ansible/hosts', ispath=True)
  29. # this is not used since 0.5 but people might still have in config
  30. DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, None)
  31.  
  32. @@ -131,7 +131,7 @@ DEFAULT_PATTERN = get_config(p, DEFAULTS, 'pattern', None, None)
  33. DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, boolean=True)
  34. DEFAULT_HOST_LIST = get_config(p, DEFAULTS,'inventory', 'ANSIBLE_INVENTORY', DEPRECATED_HOST_LIST, ispath=True)
  35. DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None, ispath=True)
  36. -DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/etc/ansible/roles', ispath=True)
  37. +DEFAULT_ROLES_PATH = get_config(p, DEFAULTS, 'roles_path', 'ANSIBLE_ROLES_PATH', '/usr/local/etc/ansible/roles', ispath=True)
  38. DEFAULT_REMOTE_TMP = get_config(p, DEFAULTS, 'remote_tmp', 'ANSIBLE_REMOTE_TEMP', '$HOME/.ansible/tmp')
  39. DEFAULT_MODULE_NAME = get_config(p, DEFAULTS, 'module_name', None, 'command')
  40. DEFAULT_FORKS = get_config(p, DEFAULTS, 'forks', 'ANSIBLE_FORKS', 5, integer=True)
  41. @@ -203,15 +203,15 @@ DEFAULT_BECOME_ASK_PASS = get_config(p, 'privilege_escalation', 'become_ask_pa
  42. # (mapping of param: squash field)
  43. DEFAULT_SQUASH_ACTIONS = get_config(p, DEFAULTS, 'squash_actions', 'ANSIBLE_SQUASH_ACTIONS', "apt, dnf, package, pkgng, yum, zypper", islist=True)
  44. # paths
  45. -DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:/usr/share/ansible/plugins/action', ispath=True)
  46. -DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:/usr/share/ansible/plugins/cache', ispath=True)
  47. -DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:/usr/share/ansible/plugins/callback', ispath=True)
  48. -DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:/usr/share/ansible/plugins/connection', ispath=True)
  49. -DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:/usr/share/ansible/plugins/lookup', ispath=True)
  50. -DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:/usr/share/ansible/plugins/inventory', ispath=True)
  51. -DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:/usr/share/ansible/plugins/vars', ispath=True)
  52. -DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:/usr/share/ansible/plugins/filter', ispath=True)
  53. -DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/share/ansible/plugins/test', ispath=True)
  54. +DEFAULT_ACTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '~/.ansible/plugins/action:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/action', ispath=True)
  55. +DEFAULT_CACHE_PLUGIN_PATH = get_config(p, DEFAULTS, 'cache_plugins', 'ANSIBLE_CACHE_PLUGINS', '~/.ansible/plugins/cache:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/cache', ispath=True)
  56. +DEFAULT_CALLBACK_PLUGIN_PATH = get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '~/.ansible/plugins/callback:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/callback', ispath=True)
  57. +DEFAULT_CONNECTION_PLUGIN_PATH = get_config(p, DEFAULTS, 'connection_plugins', 'ANSIBLE_CONNECTION_PLUGINS', '~/.ansible/plugins/connection:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/connection', ispath=True)
  58. +DEFAULT_LOOKUP_PLUGIN_PATH = get_config(p, DEFAULTS, 'lookup_plugins', 'ANSIBLE_LOOKUP_PLUGINS', '~/.ansible/plugins/lookup:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/lookup', ispath=True)
  59. +DEFAULT_INVENTORY_PLUGIN_PATH = get_config(p, DEFAULTS, 'inventory_plugins', 'ANSIBLE_INVENTORY_PLUGINS', '~/.ansible/plugins/inventory:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/inventory', ispath=True)
  60. +DEFAULT_VARS_PLUGIN_PATH = get_config(p, DEFAULTS, 'vars_plugins', 'ANSIBLE_VARS_PLUGINS', '~/.ansible/plugins/vars:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/vars', ispath=True)
  61. +DEFAULT_FILTER_PLUGIN_PATH = get_config(p, DEFAULTS, 'filter_plugins', 'ANSIBLE_FILTER_PLUGINS', '~/.ansible/plugins/filter:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/filter', ispath=True)
  62. +DEFAULT_TEST_PLUGIN_PATH = get_config(p, DEFAULTS, 'test_plugins', 'ANSIBLE_TEST_PLUGINS', '~/.ansible/plugins/test:/usr/local/Cellar/ansible/2.0.2.0/share/ansible/plugins/test', ispath=True)
  63. DEFAULT_STDOUT_CALLBACK = get_config(p, DEFAULTS, 'stdout_callback', 'ANSIBLE_STDOUT_CALLBACK', 'default')
  64. # cache
  65. CACHE_PLUGIN = get_config(p, DEFAULTS, 'fact_caching', 'ANSIBLE_CACHE_PLUGIN', 'memory')
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!