83a3a8d821
Prior this commit the ami image type produced raw.xz images. This was bad for two reasons: - The upload was broken because AWS doesn't support tar.xz format - XZ compression is terribly slow This commit changes the format to vhdx, which is supported by AWS and also quite quick. See https://github.com/osbuild/osbuild-composer/issues/257 why vhdx was chosen. Fixes #257
213 lines
6.9 KiB
JSON
213 lines
6.9 KiB
JSON
{
|
|
"ami": {
|
|
"boot": {
|
|
"type": "aws"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "ami",
|
|
"repositories": [],
|
|
"filename": "image.vhdx",
|
|
"blueprint": {}
|
|
}
|
|
},
|
|
"ext4-filesystem": {
|
|
"boot": {
|
|
"type": "nspawn"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "ext4-filesystem",
|
|
"repositories": [],
|
|
"filename": "filesystem.img",
|
|
"blueprint": {
|
|
"name": "ext4-filesystem-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [
|
|
{
|
|
"name": "openssh-server",
|
|
"version": "*"
|
|
}
|
|
],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"openstack": {
|
|
"boot": {
|
|
"type": "qemu"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "openstack",
|
|
"repositories": [],
|
|
"filename": "disk.qcow2",
|
|
"blueprint": {
|
|
"name": "openstack-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"partitioned-disk": {
|
|
"boot": {
|
|
"type": "nspawn"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "partitioned-disk",
|
|
"filename": "disk.img",
|
|
"repositories": [],
|
|
"blueprint": {
|
|
"name": "partitioned-disk-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"tar": {
|
|
"boot": {
|
|
"type": "nspawn-extract"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "tar",
|
|
"repositories": [],
|
|
"filename": "root.tar.xz",
|
|
"blueprint": {
|
|
"name": "tar-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [
|
|
{
|
|
"name": "openssh-server",
|
|
"version": "*"
|
|
}
|
|
],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"qcow2": {
|
|
"boot": {
|
|
"type": "qemu"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "qcow2",
|
|
"repositories": [],
|
|
"filename": "disk.qcow2",
|
|
"blueprint": {
|
|
"name": "qcow2-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"vhd": {
|
|
"boot": {
|
|
"type": "qemu"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "vhd",
|
|
"repositories": [],
|
|
"filename": "disk.vhd",
|
|
"blueprint": {
|
|
"name": "vhd-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"vmdk": {
|
|
"boot": {
|
|
"type": "qemu"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "vmdk",
|
|
"filename": "disk.vmdk",
|
|
"blueprint": {
|
|
"name": "vmdk-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|