diff --git a/modules/ansible_generator.py b/modules/ansible_generator.py index d7584e2ef5469cf77046f6f9486c87bcdbd024df..94a7b951ff58e7eff669e9e6e6da91fa39b0d43c 100644 --- a/modules/ansible_generator.py +++ b/modules/ansible_generator.py @@ -14,7 +14,6 @@ def _create_inventory(input_definitions): inventory_template = load_template("inventory") output = inventory_template.render(hosts=host_names, routers=router_names) generate_file("provisioning/inventory.ini", output) - generate_file("base_provisioning/inventory.ini", output) def generate_playbooks(input_definitions, flags): diff --git a/modules/vagrant_generator.py b/modules/vagrant_generator.py index 82ff2482c585533d54bb546fcb596bdc90be5f1d..bd8331eba2a2ad919ecd4a559a90422de31ec372 100644 --- a/modules/vagrant_generator.py +++ b/modules/vagrant_generator.py @@ -6,6 +6,10 @@ from modules.file_manager import load_template, generate_file, open_yaml VAGRANT_MAPPING = open_yaml("conf/vagrant_mapping.yml") VIRTUALBOX_MAPPING = open_yaml("conf/virtualbox_mapping.yml") +BASE_PLAYBOOK = "base_provisioning/device_configuration.yml" +USER_PLAYBOOK = "provisioning/playbook.yml" +INVENTORY_FILE = "provisioning/inventory.ini" + def _create_simple_attribute(key, value, attribute_type): @@ -56,6 +60,12 @@ def _create_ansible_commands(playbook_location, flags): playbook["value"] = playbook_location commands.append(playbook) + inventory = dict() + inventory["type"] = "string" + inventory["command"] = "inventory_path" + inventory["value"] = INVENTORY_FILE + commands.append(inventory) + if "verbose_ansible" in flags and flags["verbose_ansible"]: verbosity = dict() verbosity["type"] = "boolean" @@ -112,7 +122,7 @@ def _call_provisioner(flags): config_playbook["provisioner"] = "ansible" config_playbook["note"] = "basic configuration of devices and networks" config_playbook["commands"] = _create_ansible_commands( - "base_provisioning/device_configuration.yml", flags) + BASE_PLAYBOOK, flags) provisioner_calls.append(config_playbook) @@ -124,7 +134,7 @@ def _call_provisioner(flags): user_playbook["provisioner"] = "ansible" user_playbook["note"] = "user configuration of devices" user_playbook["commands"] = _create_ansible_commands( - "base_provisioning/playbook.yml", flags) + USER_PLAYBOOK, flags) provisioner_calls.append(user_playbook)