Skip to content
Snippets Groups Projects
Commit a9b2e29b authored by Attila Farkas's avatar Attila Farkas
Browse files

Support user extra vars for ansible

parent 50741483
No related branches found
No related tags found
1 merge request!32Version 2.0.0
......@@ -41,3 +41,7 @@ class Provision:
elif sandbox.generate_provisioning or \
not Provision._provisioning_exists(sandbox):
Provision._generate_template_provisioning(sandbox)
if sandbox.extra_vars is not None:
Writer.copy_file(sandbox.extra_vars,
sandbox.sandbox_dir /
sandbox.config["user_extra_vars"])
......@@ -128,7 +128,7 @@ class Sandbox:
self.ansible_installed: bool = ansible_installed
self.verbose_ansible: bool = verbose_ansible
self.user_provisioning_dir: Optional[Path] = user_provisioning_dir
self.extra_vars: Optional[Dict] = self._load_extra_vars(extra_vars_file)
self.extra_vars: Optional[Path] = extra_vars_file
self.config: Dict = Reader.open_yaml(configuration_path)
self.flavors: List[Flavor] = self._load_flavors(flavors_path)
self.networks: List[Network] = self._create_network_list(topology,
......@@ -155,18 +155,6 @@ class Sandbox:
return networks
@classmethod
def _load_extra_vars(cls, extra_vars_path: Optional[Path]) -> Optional[Dict]:
"""Load extra vars for ansible from YAML file to a Dict"""
extra_vars: Optional[Dict] = None
if extra_vars_path:
extra_vars = Reader.open_yaml(extra_vars_path)
if not isinstance(extra_vars, Dict):
raise TypeError("The content of extra_vars file is invalid")
return extra_vars
@classmethod
def _load_flavors(cls, flavors_path: Path) -> List[Flavor]:
"""Load list of possible flavors from configuration file"""
......
......@@ -110,6 +110,9 @@ class Vagrantfile:
sandbox.config["provisioning_playbook"])]
if sandbox.verbose_ansible:
attributes.append(String("verbose", "vv"))
if sandbox.extra_vars is not None:
attributes.append(String("extra_vars",
sandbox.config["user_extra_vars"]))
return attributes
@staticmethod
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment