Generalize extra variable parsing and loading

Fixes #11352
This commit is contained in:
James Cammarata 2015-07-21 00:18:12 -04:00
commit b8b206005c
3 changed files with 22 additions and 17 deletions

View file

@ -17,13 +17,14 @@
########################################################
from ansible import constants as C
from ansible.cli import CLI
from ansible.errors import AnsibleOptionsError
from ansible.executor.task_queue_manager import TaskQueueManager
from ansible.inventory import Inventory
from ansible.parsing import DataLoader
from ansible.parsing.splitter import parse_kv
from ansible.playbook.play import Play
from ansible.cli import CLI
from ansible.utils.vars import load_extra_vars
from ansible.vars import VariableManager
########################################################
@ -100,6 +101,7 @@ class AdHocCLI(CLI):
loader = DataLoader(vault_password=vault_pass)
variable_manager = VariableManager()
variable_manager.extra_vars = load_extra_vars(loader=loader, options=self.options)
inventory = Inventory(loader=loader, variable_manager=variable_manager, host_list=self.options.inventory)
variable_manager.set_inventory(inventory)