Merge "Use default molecule config for roles having delegated driver"

tripleo_ansible/ansible_plugins/tests/molecule/container_startup_config/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/ansible_plugins/tests/molecule/tripleo_container_config_scripts/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/ansible_plugins/tests/molecule/tripleo_container_configs/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/ansible_plugins/tests/molecule/tripleo_os_net_config/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/ansible_plugins/tests/molecule/tripleo_strategies/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance1
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_container_manage/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_container_rm/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_container_stop/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_container_tag/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   inventory:

tripleo_ansible/roles/tripleo_firewall/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_firewall/molecule/firewall-masquerade/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_module_load/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml

@@ -1,23 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
 platforms:
   - name: instance
     pkg_extras: libselinux-python* policycoreutils-python-utils

tripleo_ansible/roles/tripleo_podman/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_podman/molecule/install/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_podman/molecule/login/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_provision_mcelog/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml

@@ -1,23 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
 platforms:
   - name: controller1
   - name: controller2

tripleo_ansible/roles/tuned/molecule/default/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml

@@ -1,26 +1,4 @@
 ---
-driver:
-  name: delegated
-  options:
-    managed: false
-    login_cmd_template: >-
-      ssh
-      -o UserKnownHostsFile=/dev/null
-      -o StrictHostKeyChecking=no
-      -o Compression=no
-      -o TCPKeepAlive=yes
-      -o VerifyHostKeyDNS=no
-      -o ForwardX11=no
-      -o ForwardAgent=no
-      {instance}
-    ansible_connection_options:
-      ansible_connection: ssh
-
-log: true
-
-platforms:
-  - name: instance
-
 provisioner:
   name: ansible
   config_options:

zuul.d/layout.yaml

@@ -13,7 +13,7 @@
       - tripleo-ci-centos-9-content-provider:
           dependencies:
             - openstack-tox-linters
-          irrelevant-files:
+          irrelevant-files: &irrelevant_files
           - ^tox.ini$
       - openstack-tox-linters
       - openstack-tox-docs: &tripleo-docs
@@ -26,7 +26,8 @@
 
     gate:
       jobs:
-      - tripleo-ci-centos-9-content-provider
+      - tripleo-ci-centos-9-content-provider:
+          irrelevant-files: *irrelevant_files
       - openstack-tox-linters
       - openstack-tox-docs: *tripleo-docs
     post: