openstack/tripleo-ansible
Code Issues Proposed changes

Upgrade molecule to 3.0

Browse Source 
Makes changes required by molecule v3.0.0

Change-Id: I7669145ce9eef0bbda662df11426be326d5f3f5e
This commit is contained in:
Sorin Sbarnea 2020-02-16 17:51:04 +00:00
parent 57cc4d8075
commit c7006fc49d
85 changed files with 5 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_skeleton_role_/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

3
molecule-requirements.txt
View File

@ -8,7 +8,8 @@ pytest-cov
pytest-html
pytest-xdist
mock
molecule==3.0a4
molecule>=3.0,<3.1
testinfra
netaddr
jinja2>=2.8.0,<3

2
setup.cfg
View File

@ -77,4 +77,4 @@ universal = 1
[pbr]
skip_authors = True
skip_changelog = True
skip_changelog = True

6
tripleo_ansible/ansible_plugins/tests/molecule/podman_container/molecule.yml
View File

@ -41,16 +41,10 @@ provisioner:
ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}"
scenario:
name: podman_container
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/ansible_plugins/tests/molecule/podman_container_info/molecule.yml
View File

@ -41,16 +41,10 @@ provisioner:
ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}"
scenario:
name: podman_container_info
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/ansible_plugins/tests/molecule/podman_volume_info/molecule.yml
View File

@ -47,10 +47,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/aide/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/backup_and_restore/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- prepare
- converge
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/login_defs/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/test_deps/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_bootstrap/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ceph_fetch_dir/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_container_manage/molecule/default/molecule.yml
View File

@ -41,16 +41,10 @@ provisioner:
ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}"
scenario:
name: default
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_rm/molecule/default/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_container_rm/molecule/docker_rm/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: docker
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_rm/molecule/podman/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_container_stop/molecule/default/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: default
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_container_stop/molecule/podman/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: podman
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_tag/molecule/default/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_tag/molecule/legacy_vars/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_container_tag/molecule/podman/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_firewall/molecule/default/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add-complex/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: firewall-add-complex
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_firewall/molecule/firewall-add/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove-complex/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_firewall/molecule/firewall-remove/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: firewall-remove
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
View File

@ -270,10 +270,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
View File

@ -60,7 +60,6 @@ provisioner:
ctlplane_ip: 192.168.24.2
internal_api_ip: 172.17.0.2
scenario:
test_sequence:
- destroy
@ -70,10 +69,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: ansible
lint:
name: ansible-lint

5
tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_kernel/molecule/default/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: default
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_kernel/molecule/extra/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/molecule.yml
View File

@ -44,10 +44,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: ansible
lint:
name: ansible-lint

2
tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/Dockerfile
View File

@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
{% endfor %}
CMD ["sh", "-c", "while true; do sleep 10000; done"]
CMD ["sh", "-c", "while true; do sleep 10000; done"]

5
tripleo_ansible/roles/tripleo_keystone_resources/molecule/default/molecule.yml
View File

@ -31,10 +31,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_module_load/molecule/default/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: default
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_module_load/molecule/legacy_vars/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: legacy_vars
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_module_load/molecule/remove_module/molecule.yml
View File

@ -45,10 +45,5 @@ scenario:
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

2
tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/Dockerfile
View File

@ -34,4 +34,4 @@ RUN easy_install {{ pkg }}
{% endfor %}
CMD ["sh", "-c", "while true; do sleep 10000; done"]
CMD ["sh", "-c", "while true; do sleep 10000; done"]

5
tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml
View File

@ -63,10 +63,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml
View File

@ -63,10 +63,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml
View File

@ -63,10 +63,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml
View File

@ -63,10 +63,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml
View File

@ -73,10 +73,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml
View File

@ -65,10 +65,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_podman/molecule/default/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: default
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_podman/molecule/install/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: install
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

6
tripleo_ansible/roles/tripleo_podman/molecule/login/molecule.yml
View File

@ -39,16 +39,10 @@ provisioner:
ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
scenario:
name: login
test_sequence:
- prepare
- converge
- verify
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml
View File

@ -40,10 +40,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml
View File

@ -39,10 +39,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
View File

@ -63,10 +63,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
View File

@ -49,10 +49,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml
View File

@ -51,10 +51,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

1
tripleo_ansible/roles/tripleo_systemd_wrapper/templates/service_sync.j2
View File

@ -49,4 +49,3 @@ done
:> {{ tripleo_systemd_wrapper_service_dir }}/{{ tripleo_systemd_wrapper_service_name }}/processes
flock -u "$lock_fd"

5
tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint:
enabled: false
verifier:
name: testinfra
lint:
name: flake8

5
tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml
View File

@ -59,10 +59,5 @@ scenario:
- verify
- destroy
lint: