lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename metadata file to not conflict

Browse Source
This commit is contained in:
Neil Hanlon 2022-11-19 17:09:00 -05:00
parent 8b099f255c
commit 57ba3ca98c
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iso/empanadas/empanadas/scripts/build_image.py
View File

@ -94,7 +94,7 @@ class ImageBuild:
self.package_args = self._package_args() self.package_args = self._package_args()
self.common_args = self._common_args() self.common_args = self._common_args()
self.metadata = pathlib.Path(self.outdir, "metadata.json") self.metadata = pathlib.Path(self.outdir, ".imagefactory-metadata.json")
self.kickstart_path = pathlib.Path(f"{KICKSTART_PATH}/Rocky-{self.architecture.major}-{self.type_variant}.ks") self.kickstart_path = pathlib.Path(f"{KICKSTART_PATH}/Rocky-{self.architecture.major}-{self.type_variant}.ks")
@ -443,7 +443,7 @@ class ImageBuild:
return template return template
def save(self): def save(self):
with open(pathlib.Path(self.outdir, "metadata.json"), "w") as f: with open(self.metadata, "w") as f:
try: try:
o = { name: getattr(self, name) for name in ["base_uuid", "target_uuid"] } o = { name: getattr(self, name) for name in ["base_uuid", "target_uuid"] }
log.debug(o) log.debug(o)

8
iso/empanadas/empanadas/templates/vagrant/vmx.tmpl
View File

@ -53,7 +53,7 @@ vmci0.id = "-1024033366"
vmci0.present = "TRUE" vmci0.present = "TRUE"
vmotion.checkpointFBSize = "134217728" vmotion.checkpointFBSize = "134217728"
displayName = "{{ outname }}" displayName = "{{ name }}"
nvram = "{{ outname }}.nvram" nvram = "{{ name }}.nvram"
scsi0:0.fileName = "{{ outname }}.vmdk" scsi0:0.fileName = "{{ name }}.vmdk"
extendedConfigFile = "{{ outname }}.vmxf" extendedConfigFile = "{{ name }}.vmxf"