Commit f10d1e9a authored by Jamie Hall's avatar Jamie Hall

Merge branch 'master' into 'master'

Modified packme to be compatible with new version of packer

See merge request !1
parents ecac8c9b 849b08d4
......@@ -98,7 +98,7 @@ class PackerTemplate:
builder["http_directory"] = os.path.join(self._templates_base_dir,self._name,builder["http_directory"])
# For convenience set the vm name with a fixed standardized value
builder["vm_name"] = "{}-{}".format(self._name,builder["type"])
builder["vm_name"] = "{}-{}.iso".format(self._name,builder["type"])
def _update_provisioner(self, provisioner : Dict[str,str], base_dir : str):
"""Update some fields of a provisioner.
......@@ -187,9 +187,8 @@ class PackerTemplate:
parent_builder = {}
parent_builder["name"] = builder_name
parent_builder["type"] = builder["type"]
parent_builder["iso_url"] = os.path.join(builder["output_directory"],"{}-{}".format(parent_template.name, builder_name))
parent_builder["iso_checksum_type"] = "none"
parent_builder["iso_checksum_url"] = "none"
parent_builder["iso_url"] = os.path.join(builder["output_directory"],"{}-{}.iso".format(parent_template.name, builder_name))
parent_builder["iso_checksum"] = "none"
parent_builder["headless"] = "{{ headless }}"
self._builders.insert(0,parent_builder)
......@@ -200,9 +199,8 @@ class PackerTemplate:
if builder is None:
continue
builder["iso_url"] = os.path.join(self._templates_base_dir,parent_template.name,"builds","{}-{}".format(parent_template.name, builder_name))
builder["iso_checksum_type"] = "none"
builder["iso_checksum_url"] = "none"
builder["iso_url"] = os.path.join(self._templates_base_dir,parent_template.name,"builds","{}-{}.iso".format(parent_template.name, builder_name))
builder["iso_checksum"] = "none"
builder["headless"] = "{{ headless }}"
def _load_packages(self, packages: List[str]):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment