Merge branch 'release/4.8.3-4alvistack3' into master

.ansible-lint

@@ -0,0 +1,2 @@
+skip_list:
+  - '106'

ansible-galaxy-requirements.yml

@@ -19,6 +19,10 @@ collections:
     src: https://galaxy.ansible.com
     version: ">=1.0.0,<2.0.0"
 
+  - name: containers.podman
+    src: https://galaxy.ansible.com
+    version: ">=1.0.0,<2.0.0"
+
   - name: operator_sdk.util
     src: https://galaxy.ansible.com
     version: ">=0.0.0,<1.0.0"

molecule/default/create.yml

@@ -20,10 +20,20 @@
   become: true
   gather_facts: false
   tasks:
+    - name: prepare directories
+      file:
+        dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}"
+        mode: "0755"
+        state: "directory"
+      loop_control:
+        label: "{{ item.name }}"
+      loop: "{{ molecule_yml.platforms }}"
+      when: item.dockerfile is defined
+
     - name: copy template
       template:
         src: "{{ molecule_scenario_directory }}/{{ item.dockerfile }}"
-        dest: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}"
+        dest: "{{ molecule_ephemeral_directory }}/{{ item.name }}/Dockerfile"
         mode: "0644"
       loop_control:
         label: "{{ item.name }}"
@@ -35,8 +45,8 @@
         name: "{{ molecule_ephemeral_directory | regex_replace('^.*/([^/]*/[^/]*)$', '\\1') }}:{{ item.name }}"
         source: "build"
         build:
-          path: "{{ molecule_ephemeral_directory }}"
-          dockerfile: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}"
+          path: "{{ molecule_ephemeral_directory }}/{{ item.name }}"
+          pull: true
       loop_control:
         label: "{{ item.name }}"
       loop: "{{ molecule_yml.platforms }}"
@@ -71,6 +81,7 @@
         tty: "{{ item.tty | default(omit) }}"
         volumes: "{{ item.volumes | default(omit) }}"
         env: "{{ item.env | default(omit) }}"
+        container_default_behavior: "no_defaults"
         state: "started"
       loop_control:
         label: "{{ item.name }}"

molecule/default/destroy.yml

@@ -47,6 +47,7 @@
     - name: docker rm
       docker_container:
         name: "{{ item.name }}"
+        container_default_behavior: "no_defaults"
         state: "absent"
       loop_control:
         label: "{{ item.name }}"

requirements.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ansible~=2.10.0a9
-ansible-lint~=4.3.0a6
+ansible-lint~=4.3.1
 ansible-runner
 ansible-runner-http
 argcomplete

scripts/bootstrap-ansible.sh

@@ -41,3 +41,6 @@ curl -skL https://bootstrap.pypa.io/get-pip.py | python3 - --prefix=/usr/local
 
 # Install PIP dependencies
 pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
+
+# Install Ansible Collection dependencies
+ansible-galaxy collection install --force --requirements-file ansible-galaxy-requirements.yml

scripts/bootstrap-vagrant.sh

@@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 if [ -x "$(command -v apt-get)" ]; then
     apt-get update
     apt-get install -y binutils bridge-utils dnsmasq-base ebtables libvirt-clients libvirt-daemon-system libvirt-dev make qemu-kvm qemu-utils ruby-dev
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb
-    dpkg -i vagrant_2.2.9_x86_64.deb
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb
+    dpkg -i vagrant_2.2.10_x86_64.deb
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare YUM dependencies
 if [ -x "$(command -v yum)" ]; then
     yum makecache
     yum install -y binutils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    yum localinstall vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    yum localinstall vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare Zypper dependencies
 if [ -x "$(command -v zypper)" ]; then
     zypper -n --gpg-auto-import-keys refresh
     zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    zypper install vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    zypper install vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Install vagrant-libvirt