From 29870face7f8767f072e90972988f09a02cd1a3c Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 28 Dec 2020 14:30:14 +0800 Subject: [PATCH 1/2] simplify for vagrant-libvirt --- molecule/centos-7/molecule.yml | 16 ++++------------ molecule/centos-8/molecule.yml | 16 ++++------------ molecule/debian-10/molecule.yml | 16 ++++------------ molecule/fedora-33/molecule.yml | 16 ++++------------ molecule/redhat-7/molecule.yml | 16 ++++------------ molecule/redhat-8/molecule.yml | 16 ++++------------ molecule/suse-15/molecule.yml | 16 ++++------------ molecule/ubuntu-18.04/molecule.yml | 16 ++++------------ molecule/ubuntu-20.04/molecule.yml | 16 ++++------------ molecule/ubuntu-20.10/molecule.yml | 16 ++++------------ 10 files changed, 40 insertions(+), 120 deletions(-) diff --git a/molecule/centos-7/molecule.yml b/molecule/centos-7/molecule.yml index b548dd8..23b3eb8 100644 --- a/molecule/centos-7/molecule.yml +++ b/molecule/centos-7/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/centos7 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/centos-8/molecule.yml b/molecule/centos-8/molecule.yml index 5a55aaf..4063582 100644 --- a/molecule/centos-8/molecule.yml +++ b/molecule/centos-8/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/centos8 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/debian-10/molecule.yml b/molecule/debian-10/molecule.yml index ff0ba8e..523eb20 100644 --- a/molecule/debian-10/molecule.yml +++ b/molecule/debian-10/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/debian10 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/fedora-33/molecule.yml b/molecule/fedora-33/molecule.yml index 924d42a..7e510e8 100644 --- a/molecule/fedora-33/molecule.yml +++ b/molecule/fedora-33/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/fedora33 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/redhat-7/molecule.yml b/molecule/redhat-7/molecule.yml index f841f5f..2f9b166 100644 --- a/molecule/redhat-7/molecule.yml +++ b/molecule/redhat-7/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/rhel7 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/redhat-8/molecule.yml b/molecule/redhat-8/molecule.yml index c5bb92a..465bde9 100644 --- a/molecule/redhat-8/molecule.yml +++ b/molecule/redhat-8/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/rhel8 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/suse-15/molecule.yml b/molecule/suse-15/molecule.yml index 28737bc..43b7664 100644 --- a/molecule/suse-15/molecule.yml +++ b/molecule/suse-15/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/opensuse15 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'sata'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'sata'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'sata', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml index 0ffc48d..c4b012a 100644 --- a/molecule/ubuntu-18.04/molecule.yml +++ b/molecule/ubuntu-18.04/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu1804 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/ubuntu-20.04/molecule.yml b/molecule/ubuntu-20.04/molecule.yml index f5a1eb7..d709710 100644 --- a/molecule/ubuntu-20.04/molecule.yml +++ b/molecule/ubuntu-20.04/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu2004 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail diff --git a/molecule/ubuntu-20.10/molecule.yml b/molecule/ubuntu-20.10/molecule.yml index 7df8bac..f0147f7 100644 --- a/molecule/ubuntu-20.10/molecule.yml +++ b/molecule/ubuntu-20.10/molecule.yml @@ -23,19 +23,11 @@ platforms: box: generic/ubuntu2010 cpu: 2 memory: 4096 - interfaces: - - auto_config: true - network_name: private_network - type: dhcp - provider_options: - cpu_mode: "'host-model'" - disk_bus: "'virtio'" - driver: "'kvm'" - nested: "'true'" - nic_model_type: "'virtio'" - video_type: "'virtio'" - volume_cache: "'writeback'" provider_raw_config_args: + - "disk_bus = 'virtio'" + - "nic_model_type = 'virtio'" + - "video_type = 'virtio'" + - "volume_cache = 'writeback'" - "storage :file, bus: 'virtio', cache: 'writeback'" lint: | set -euo pipefail From 392594b731f9ba32c0c1f01ff992d6e8655af0ae Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Mon, 28 Dec 2020 22:45:03 +0800 Subject: [PATCH 2/2] 4.6.0 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a1b219..1ba2e69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ # Ansible Role for conmon -## 4.6.0 - TBC +## 4.7.0 - TBC ### Major Changes +## 4.6.0 - 2020-12-28 + +### Major Changes + + - Simplify Molecule scenario for vagrant-libvirt - Migrate from Travis CI to GitLab CI - Support Fedora 33 - Remove Fedora 32 support