From b8962774c7a4a8e6ebf2435dcfbf32be42a5085a Mon Sep 17 00:00:00 2001 From: dinadins Date: Sat, 21 Dec 2024 17:30:38 +0200 Subject: [PATCH] resolve merge conflict --- src/molecule_plugins/vagrant/modules/vagrant.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/molecule_plugins/vagrant/modules/vagrant.py b/src/molecule_plugins/vagrant/modules/vagrant.py index 75e70925..10661bc0 100755 --- a/src/molecule_plugins/vagrant/modules/vagrant.py +++ b/src/molecule_plugins/vagrant/modules/vagrant.py @@ -220,6 +220,9 @@ {% if instance.box_url %} {{ 'c.vm.box_url = "{}"'.format(instance.box_url) | safe }} {% endif %} + {% if instance.box_architecture %} + {{ 'c.vm.box_architecture = "{}"'.format(instance.box_architecture) | safe }} + {% endif %} {% if instance.box_download_checksum %} {{ 'c.vm.box_download_checksum = "{}"'.format(instance.box_download_checksum) | safe }} {% endif %} @@ -575,7 +578,9 @@ def _get_config(self): def _write_vagrantfile(self): instances = self._get_vagrant_config_dict() j_env = jinja2.Environment( - autoescape=True, trim_blocks=True, lstrip_blocks=True, + autoescape=True, + trim_blocks=True, + lstrip_blocks=True, ) t = j_env.from_string(VAGRANTFILE_TEMPLATE) template = t.render( @@ -649,6 +654,7 @@ def _get_instance_vagrant_config_dict(self, instance): "box": instance.get("box", self._module.params["default_box"]), "box_version": instance.get("box_version"), "box_url": instance.get("box_url"), + "box_architecture": instance.get("box_architecture"), "box_download_checksum": checksum, "box_download_checksum_type": checksum_type, "provider": self._module.params["provider_name"], @@ -706,6 +712,7 @@ def main(): "platform_box": {"type": "str", "required": False}, "platform_box_version": {"type": "str"}, "platform_box_url": {"type": "str"}, + "platform_box_architecture": {"type": "str"}, "platform_box_download_checksum": {"type": "str"}, "platform_box_download_checksum_type": {"type": "str"}, "provider_memory": {"type": "int", "default": 512},