diff --git a/config.yml b/config.yml
index c9e674c1b7b4fac215ffefbfd53ebc0ae3bf64bd..f9ce5124d754d8e1caaffd133241e47c26989356 100644
--- a/config.yml
+++ b/config.yml
@@ -1,7 +1,7 @@
images:
- debian10:
- name: Debian 10 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-10/debian-10-openstack-amd64.qcow2
+ debian9:
+ name: Debian 9 - GARR
+ url: https://cdimage.debian.org/cdimage/openstack/current-9/debian-9-openstack-amd64.qcow2
disk_format: qcow2
extraargs:
- "min_disk=5"
@@ -9,29 +9,15 @@ images:
tags:
- "os_distro=debian"
- "os_type=linux"
- - "os_version=10"
+ - "os_version=9"
- "architecture=amd64"
- "os_require_quiesce=yes"
- "hw_qemu_guest_agent=yes"
- "hw_vif_multiqueue_enabled=true"
- "hw_rng_model=virtio"
- debian8:
- name: Debian 8 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-8/debian-8-openstack-amd64.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=debian"
- - "os_type=linux"
- - "os_version=8"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- debian9:
- name: Debian 9 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-9/debian-9-openstack-amd64.qcow2
+ debian10:
+ name: Debian 10 - GARR
+ url: https://cdimage.debian.org/cdimage/openstack/current-10/debian-10-openstack-amd64.qcow2
disk_format: qcow2
extraargs:
- "min_disk=5"
@@ -39,7 +25,7 @@ images:
tags:
- "os_distro=debian"
- "os_type=linux"
- - "os_version=9"
+ - "os_version=10"
- "architecture=amd64"
- "os_require_quiesce=yes"
- "hw_qemu_guest_agent=yes"
@@ -61,24 +47,25 @@ images:
- "hw_qemu_guest_agent=yes"
- "hw_vif_multiqueue_enabled=true"
- "hw_rng_model=virtio"
- centos7:
- name: CentOS 7 - GARR
- url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
+ fedora29:
+ name: Fedora 29 - GARR
+ url: https://download.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.qcow2
disk_format: qcow2
extraargs:
- "min_disk=5"
- "min_ram=1024"
tags:
- - "os_distro=centos"
+ - "os_distro=fedora"
- "os_type=linux"
- - "os_version=7.X"
+ - "os_version=29"
- "architecture=x86_64"
- "os_require_quiesce=yes"
- "hw_qemu_guest_agent=yes"
- "hw_vif_multiqueue_enabled=true"
- centos6:
- name: CentOS 6 - GARR
- url: http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud.qcow2
+ - "hw_rng_model=virtio"
+ centos7:
+ name: CentOS 7 - GARR
+ url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
disk_format: qcow2
extraargs:
- "min_disk=5"
@@ -86,24 +73,17 @@ images:
tags:
- "os_distro=centos"
- "os_type=linux"
- - "os_version=6.X"
+ - "os_version=7.X"
- "architecture=x86_64"
- "os_require_quiesce=yes"
- "hw_qemu_guest_agent=yes"
+ - "hw_vif_multiqueue_enabled=true"
+ ubuntu-12.04:
+ name: Ubuntu 12.04 - GARR
+ simplestreams: com.ubuntu.cloud:server:12.04:amd64
ubuntu-14.04:
name: Ubuntu 14.04 - GARR
- url: https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=ubuntu"
- - "os_type=linux"
- - "os_version=14.04"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
+ simplestreams: com.ubuntu.cloud:server:14.04:amd64
ubuntu-16.04:
name: Ubuntu 16.04 - GARR
url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
@@ -120,6 +100,7 @@ images:
- "hw_qemu_guest_agent=yes"
- "hw_vif_multiqueue_enabled=true"
- "hw_rng_model=virtio"
+ simplestreams: com.ubuntu.cloud:server:16.04:amd64
ubuntu-18.04:
name: Ubuntu 18.04 - GARR
url: http://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img
@@ -136,3 +117,4 @@ images:
- "hw_qemu_guest_agent=yes"
- "hw_vif_multiqueue_enabled=true"
- "hw_rng_model=virtio"
+ simplestreams: com.ubuntu.cloud:server:18.04:amd64
diff --git a/config.yml.all b/config.yml.all
deleted file mode 100644
index c9e674c1b7b4fac215ffefbfd53ebc0ae3bf64bd..0000000000000000000000000000000000000000
--- a/config.yml.all
+++ /dev/null
@@ -1,138 +0,0 @@
-images:
- debian10:
- name: Debian 10 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-10/debian-10-openstack-amd64.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=debian"
- - "os_type=linux"
- - "os_version=10"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- - "hw_rng_model=virtio"
- debian8:
- name: Debian 8 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-8/debian-8-openstack-amd64.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=debian"
- - "os_type=linux"
- - "os_version=8"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- debian9:
- name: Debian 9 - GARR
- url: https://cdimage.debian.org/cdimage/openstack/current-9/debian-9-openstack-amd64.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=debian"
- - "os_type=linux"
- - "os_version=9"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- - "hw_rng_model=virtio"
- fedora28:
- name: Fedora 28 - GARR
- url: https://download.fedoraproject.org/pub/fedora/linux/releases/28/Cloud/x86_64/images/Fedora-Cloud-Base-28-1.1.x86_64.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=fedora"
- - "os_type=linux"
- - "os_version=28"
- - "architecture=x86_64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- - "hw_rng_model=virtio"
- centos7:
- name: CentOS 7 - GARR
- url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=centos"
- - "os_type=linux"
- - "os_version=7.X"
- - "architecture=x86_64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- centos6:
- name: CentOS 6 - GARR
- url: http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud.qcow2
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=centos"
- - "os_type=linux"
- - "os_version=6.X"
- - "architecture=x86_64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- ubuntu-14.04:
- name: Ubuntu 14.04 - GARR
- url: https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=ubuntu"
- - "os_type=linux"
- - "os_version=14.04"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- ubuntu-16.04:
- name: Ubuntu 16.04 - GARR
- url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=ubuntu"
- - "os_type=linux"
- - "os_version=16.04"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- - "hw_rng_model=virtio"
- ubuntu-18.04:
- name: Ubuntu 18.04 - GARR
- url: http://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img
- disk_format: qcow2
- extraargs:
- - "min_disk=5"
- - "min_ram=1024"
- tags:
- - "os_distro=ubuntu"
- - "os_type=linux"
- - "os_version=18.04"
- - "architecture=amd64"
- - "os_require_quiesce=yes"
- - "hw_qemu_guest_agent=yes"
- - "hw_vif_multiqueue_enabled=true"
- - "hw_rng_model=virtio"