Merge branch 'release/4.6.0'

.gitlab-ci.yml

@@ -78,45 +78,48 @@ build:ubuntu-18.04:
 test:ubuntu-20.10:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "ubuntu-20.10"
+  allow_failure: true
 
 test:centos-8:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "centos-8"
+  allow_failure: true
 
 test:centos-7:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "centos-7"
+  allow_failure: true
 
 test:suse-15:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "suse-15"
+  allow_failure: true
 
 test:debian-10:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "debian-10"
+  allow_failure: true
 
 test:fedora-33:
   <<: *job-molecule
   stage: test
-  allow_failure: true
   variables:
     _MOLECULE_SCENARIO_NAME: "fedora-33"
+  allow_failure: true
 
 deploy:ansible-galaxy:
   <<: *job-ansible-galaxy
   stage: deploy
+  needs:
+    - build:ubuntu-20.04
+    - build:ubuntu-18.04

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Ansible Role for CVS
 
-## 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

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

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

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

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

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

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

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

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

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

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