diff options
48 files changed, 22 insertions, 22 deletions
diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml index 6000e0e7..733ad188 100644 --- a/ansible/roles/application/molecule/custom_role/molecule.yml +++ b/ansible/roles/application/molecule/custom_role/molecule.yml @@ -35,7 +35,7 @@ provisioner: helm_version: v2 playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml scenario: name: custom_role diff --git a/ansible/roles/application/molecule/default/playbook.yml b/ansible/roles/application/molecule/default/converge.yml index 4121f124..4121f124 100644 --- a/ansible/roles/application/molecule/default/playbook.yml +++ b/ansible/roles/application/molecule/default/converge.yml diff --git a/ansible/roles/application/molecule/helm3/molecule.yml b/ansible/roles/application/molecule/helm3/molecule.yml index 50e9cb84..8ca5fca1 100644 --- a/ansible/roles/application/molecule/helm3/molecule.yml +++ b/ansible/roles/application/molecule/helm3/molecule.yml @@ -33,7 +33,7 @@ provisioner: helm_version: v3 playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml scenario: name: helm3 diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml index aa8151fa..42523388 100644 --- a/ansible/roles/application/molecule/ubuntu/molecule.yml +++ b/ansible/roles/application/molecule/ubuntu/molecule.yml @@ -34,7 +34,7 @@ provisioner: helm_version: v2 playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml scenario: name: ubuntu diff --git a/ansible/roles/certificates/molecule/default/playbook.yml b/ansible/roles/certificates/molecule/default/converge.yml index 13583ebb..13583ebb 100644 --- a/ansible/roles/certificates/molecule/default/playbook.yml +++ b/ansible/roles/certificates/molecule/default/converge.yml diff --git a/ansible/roles/certificates/molecule/ubuntu/molecule.yml b/ansible/roles/certificates/molecule/ubuntu/molecule.yml index 9708bd9b..aa519907 100644 --- a/ansible/roles/certificates/molecule/ubuntu/molecule.yml +++ b/ansible/roles/certificates/molecule/ubuntu/molecule.yml @@ -30,7 +30,7 @@ provisioner: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library playbooks: - converge: ../default/playbook.yml + converge: ../default/converge.yml inventory: links: group_vars: ../../../../group_vars/ diff --git a/ansible/roles/chartmuseum/molecule/default/playbook.yml b/ansible/roles/chartmuseum/molecule/default/converge.yml index 2694582a..2694582a 100644 --- a/ansible/roles/chartmuseum/molecule/default/playbook.yml +++ b/ansible/roles/chartmuseum/molecule/default/converge.yml diff --git a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml b/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml index 307988ad..8b50ec54 100644 --- a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml +++ b/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml @@ -28,7 +28,7 @@ provisioner: group_vars: ../../../../group_vars playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml scenario: name: ubuntu verifier: diff --git a/ansible/roles/chrony/molecule/default/playbook.yml b/ansible/roles/chrony/molecule/default/converge.yml index 717d0f39..717d0f39 100644 --- a/ansible/roles/chrony/molecule/default/playbook.yml +++ b/ansible/roles/chrony/molecule/default/converge.yml diff --git a/ansible/roles/chrony/molecule/external_time_source/playbook.yml b/ansible/roles/chrony/molecule/external_time_source/converge.yml index 7dccfc35..7dccfc35 100644 --- a/ansible/roles/chrony/molecule/external_time_source/playbook.yml +++ b/ansible/roles/chrony/molecule/external_time_source/converge.yml diff --git a/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml b/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml index 0fbef39b..8bdccee1 100644 --- a/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml +++ b/ansible/roles/chrony/molecule/external_time_source_ubuntu/molecule.yml @@ -41,7 +41,7 @@ provisioner: timezone: Europe/Warsaw playbooks: prepare: ../default/prepare.yml - converge: ../external_time_source/playbook.yml + converge: ../external_time_source/converge.yml verifier: name: testinfra options: diff --git a/ansible/roles/chrony/molecule/ubuntu/molecule.yml b/ansible/roles/chrony/molecule/ubuntu/molecule.yml index a92dfa3b..32aef6fb 100644 --- a/ansible/roles/chrony/molecule/ubuntu/molecule.yml +++ b/ansible/roles/chrony/molecule/ubuntu/molecule.yml @@ -33,7 +33,7 @@ provisioner: ANSIBLE_ROLES_PATH: ../../../../test/roles playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml verifier: name: testinfra options: diff --git a/ansible/roles/dns/molecule/default/playbook.yml b/ansible/roles/dns/molecule/default/converge.yml index 8754f8b0..8754f8b0 100644 --- a/ansible/roles/dns/molecule/default/playbook.yml +++ b/ansible/roles/dns/molecule/default/converge.yml diff --git a/ansible/roles/dns/molecule/ubuntu/molecule.yml b/ansible/roles/dns/molecule/ubuntu/molecule.yml index 5621b733..ae763c22 100644 --- a/ansible/roles/dns/molecule/ubuntu/molecule.yml +++ b/ansible/roles/dns/molecule/ubuntu/molecule.yml @@ -25,7 +25,7 @@ provisioner: ANSIBLE_LIBRARY: ../../../../library playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml inventory: host_vars: diff --git a/ansible/roles/docker/molecule/default/playbook.yml b/ansible/roles/docker/molecule/default/converge.yml index 7384ae27..7384ae27 100644 --- a/ansible/roles/docker/molecule/default/playbook.yml +++ b/ansible/roles/docker/molecule/default/converge.yml diff --git a/ansible/roles/docker/molecule/ubuntu/molecule.yml b/ansible/roles/docker/molecule/ubuntu/molecule.yml index 751782af..a4705a14 100644 --- a/ansible/roles/docker/molecule/ubuntu/molecule.yml +++ b/ansible/roles/docker/molecule/ubuntu/molecule.yml @@ -25,7 +25,7 @@ provisioner: name: ansible playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml env: ANSIBLE_ROLES_PATH: ../../../../test/roles ANSIBLE_LIBRARY: ../../../../library diff --git a/ansible/roles/firewall/molecule/default/playbook.yml b/ansible/roles/firewall/molecule/default/converge.yml index 73b20eac..73b20eac 100644 --- a/ansible/roles/firewall/molecule/default/playbook.yml +++ b/ansible/roles/firewall/molecule/default/converge.yml diff --git a/ansible/roles/helm/molecule/default/playbook.yml b/ansible/roles/helm/molecule/default/converge.yml index 0f3fbc27..0f3fbc27 100644 --- a/ansible/roles/helm/molecule/default/playbook.yml +++ b/ansible/roles/helm/molecule/default/converge.yml diff --git a/ansible/roles/helm/molecule/helm3/converge.yml b/ansible/roles/helm/molecule/helm3/converge.yml new file mode 120000 index 00000000..73cb8dad --- /dev/null +++ b/ansible/roles/helm/molecule/helm3/converge.yml @@ -0,0 +1 @@ +../default/converge.yml
\ No newline at end of file diff --git a/ansible/roles/helm/molecule/helm3/playbook.yml b/ansible/roles/helm/molecule/helm3/playbook.yml deleted file mode 120000 index a3e26797..00000000 --- a/ansible/roles/helm/molecule/helm3/playbook.yml +++ /dev/null @@ -1 +0,0 @@ -../default/playbook.yml
\ No newline at end of file diff --git a/ansible/roles/helm/molecule/ubuntu/molecule.yml b/ansible/roles/helm/molecule/ubuntu/molecule.yml index 9a972881..c4354e88 100644 --- a/ansible/roles/helm/molecule/ubuntu/molecule.yml +++ b/ansible/roles/helm/molecule/ubuntu/molecule.yml @@ -20,7 +20,7 @@ provisioner: ANSIBLE_LIBRARY: ../../../../library playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml inventory: group_vars: all: diff --git a/ansible/roles/kubectl/molecule/default/playbook.yml b/ansible/roles/kubectl/molecule/default/converge.yml index ab9c08a8..ab9c08a8 100644 --- a/ansible/roles/kubectl/molecule/default/playbook.yml +++ b/ansible/roles/kubectl/molecule/default/converge.yml diff --git a/ansible/roles/kubectl/molecule/ubuntu/molecule.yml b/ansible/roles/kubectl/molecule/ubuntu/molecule.yml index e9422fd2..56edda13 100644 --- a/ansible/roles/kubectl/molecule/ubuntu/molecule.yml +++ b/ansible/roles/kubectl/molecule/ubuntu/molecule.yml @@ -23,7 +23,7 @@ provisioner: ANSIBLE_LIBRARY: ../../../../library playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml inventory: group_vars: all: diff --git a/ansible/roles/nexus/molecule/default/playbook.yml b/ansible/roles/nexus/molecule/default/converge.yml index e10ea55b..e10ea55b 100644 --- a/ansible/roles/nexus/molecule/default/playbook.yml +++ b/ansible/roles/nexus/molecule/default/converge.yml diff --git a/ansible/roles/nexus/molecule/ubuntu/molecule.yml b/ansible/roles/nexus/molecule/ubuntu/molecule.yml index d882633a..6925a9d4 100644 --- a/ansible/roles/nexus/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nexus/molecule/ubuntu/molecule.yml @@ -27,7 +27,7 @@ provisioner: group_vars: ../../../../group_vars playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml scenario: name: ubuntu diff --git a/ansible/roles/nfs/molecule/default/playbook.yml b/ansible/roles/nfs/molecule/default/converge.yml index 37aad5b9..37aad5b9 100644 --- a/ansible/roles/nfs/molecule/default/playbook.yml +++ b/ansible/roles/nfs/molecule/default/converge.yml diff --git a/ansible/roles/nfs/molecule/ubuntu/molecule.yml b/ansible/roles/nfs/molecule/ubuntu/molecule.yml index 61728cde..4cc5fb55 100644 --- a/ansible/roles/nfs/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nfs/molecule/ubuntu/molecule.yml @@ -45,7 +45,7 @@ provisioner: host_vars: ../default/host_vars playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml scenario: name: ubuntu verifier: diff --git a/ansible/roles/nginx/molecule/default/playbook.yml b/ansible/roles/nginx/molecule/default/converge.yml index 431bb666..431bb666 100644 --- a/ansible/roles/nginx/molecule/default/playbook.yml +++ b/ansible/roles/nginx/molecule/default/converge.yml diff --git a/ansible/roles/nginx/molecule/ubuntu/molecule.yml b/ansible/roles/nginx/molecule/ubuntu/molecule.yml index d882633a..6925a9d4 100644 --- a/ansible/roles/nginx/molecule/ubuntu/molecule.yml +++ b/ansible/roles/nginx/molecule/ubuntu/molecule.yml @@ -27,7 +27,7 @@ provisioner: group_vars: ../../../../group_vars playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml scenario: name: ubuntu diff --git a/ansible/roles/package-repository-check/molecule/default/playbook.yml b/ansible/roles/package-repository-check/molecule/default/converge.yml index 7dd80c77..7dd80c77 100755 --- a/ansible/roles/package-repository-check/molecule/default/playbook.yml +++ b/ansible/roles/package-repository-check/molecule/default/converge.yml diff --git a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml index 23e7a61e..3a1cf7cd 100755 --- a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml +++ b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml @@ -22,7 +22,7 @@ platforms: provisioner: name: ansible playbooks: - converge: ../default/playbook.yml + converge: ../default/converge.yml inventory: host_vars: infrastructure-server: diff --git a/ansible/roles/package-repository/molecule/default/playbook.yml b/ansible/roles/package-repository/molecule/default/converge.yml index 0b9c72f0..0b9c72f0 100644 --- a/ansible/roles/package-repository/molecule/default/playbook.yml +++ b/ansible/roles/package-repository/molecule/default/converge.yml diff --git a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository/molecule/ubuntu/molecule.yml index f32e6490..23a45ef9 100644 --- a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml +++ b/ansible/roles/package-repository/molecule/ubuntu/molecule.yml @@ -32,7 +32,7 @@ platforms: provisioner: name: ansible playbooks: - converge: ../default/playbook.yml + converge: ../default/converge.yml inventory: host_vars: infrastructure-server: diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/converge.yml index afdbb4af..afdbb4af 100644 --- a/ansible/roles/rancher/molecule/default/playbook.yml +++ b/ansible/roles/rancher/molecule/default/converge.yml diff --git a/ansible/roles/resource-data/molecule/default/playbook.yml b/ansible/roles/resource-data/molecule/default/converge.yml index cdd9820f..cdd9820f 100644 --- a/ansible/roles/resource-data/molecule/default/playbook.yml +++ b/ansible/roles/resource-data/molecule/default/converge.yml diff --git a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml b/ansible/roles/resource-data/molecule/ubuntu/molecule.yml index df886dbd..f60b02d5 100644 --- a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml +++ b/ansible/roles/resource-data/molecule/ubuntu/molecule.yml @@ -42,7 +42,7 @@ provisioner: ANSIBLE_ROLES_PATH: ../../../../test/roles/ playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml scenario: name: ubuntu verifier: diff --git a/ansible/roles/rke/molecule/default/playbook.yml b/ansible/roles/rke/molecule/default/converge.yml index 8db7aef5..8db7aef5 100644 --- a/ansible/roles/rke/molecule/default/playbook.yml +++ b/ansible/roles/rke/molecule/default/converge.yml diff --git a/ansible/roles/rke/molecule/etcd_storage/molecule.yml b/ansible/roles/rke/molecule/etcd_storage/molecule.yml index 9c9bb9b8..5c8a5732 100644 --- a/ansible/roles/rke/molecule/etcd_storage/molecule.yml +++ b/ansible/roles/rke/molecule/etcd_storage/molecule.yml @@ -46,7 +46,7 @@ provisioner: e: "app_data_path=/opt/onap" playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml destroy: ../default/destroy.yml scenario: name: etcd_storage diff --git a/ansible/roles/setup/molecule/default/playbook.yml b/ansible/roles/setup/molecule/default/converge.yml index 19a90501..19a90501 100644 --- a/ansible/roles/setup/molecule/default/playbook.yml +++ b/ansible/roles/setup/molecule/default/converge.yml diff --git a/ansible/roles/setup/molecule/ubuntu/molecule.yml b/ansible/roles/setup/molecule/ubuntu/molecule.yml index d0cce594..0d9b9c9f 100644 --- a/ansible/roles/setup/molecule/ubuntu/molecule.yml +++ b/ansible/roles/setup/molecule/ubuntu/molecule.yml @@ -15,7 +15,7 @@ platforms: provisioner: name: ansible playbooks: - converge: ../default/playbook.yml + converge: ../default/converge.yml scenario: name: ubuntu verifier: diff --git a/ansible/roles/vncserver/molecule/default/playbook.yml b/ansible/roles/vncserver/molecule/default/converge.yml index 1b253495..1b253495 100644 --- a/ansible/roles/vncserver/molecule/default/playbook.yml +++ b/ansible/roles/vncserver/molecule/default/converge.yml diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml index 38dbe7fd..604d7360 100644 --- a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml +++ b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml @@ -22,7 +22,7 @@ provisioner: name: ansible playbooks: prepare: ../default/prepare.yml - converge: ../default/playbook.yml + converge: ../default/converge.yml cleanup: ../default/cleanup.yml env: ANSIBLE_ROLES_PATH: ../../../../test/roles diff --git a/ansible/test/play-infrastructure/molecule/default/playbook.yml b/ansible/test/play-infrastructure/molecule/default/converge.yml index 26b3c15d..26b3c15d 100644 --- a/ansible/test/play-infrastructure/molecule/default/playbook.yml +++ b/ansible/test/play-infrastructure/molecule/default/converge.yml diff --git a/ansible/test/play-resources/molecule/default/playbook.yml b/ansible/test/play-resources/molecule/default/converge.yml index 096077a2..096077a2 100644 --- a/ansible/test/play-resources/molecule/default/playbook.yml +++ b/ansible/test/play-resources/molecule/default/converge.yml diff --git a/ansible/test/play-resources/molecule/nfs/playbook.yml b/ansible/test/play-resources/molecule/nfs/converge.yml index 096077a2..096077a2 100644 --- a/ansible/test/play-resources/molecule/nfs/playbook.yml +++ b/ansible/test/play-resources/molecule/nfs/converge.yml diff --git a/ansible/test/play-rke/molecule/default/playbook.yml b/ansible/test/play-rke/molecule/default/converge.yml index aa2e0df2..aa2e0df2 100644 --- a/ansible/test/play-rke/molecule/default/playbook.yml +++ b/ansible/test/play-rke/molecule/default/converge.yml diff --git a/ansible/test/play-rke/molecule/helm3/converge.yml b/ansible/test/play-rke/molecule/helm3/converge.yml new file mode 120000 index 00000000..73cb8dad --- /dev/null +++ b/ansible/test/play-rke/molecule/helm3/converge.yml @@ -0,0 +1 @@ +../default/converge.yml
\ No newline at end of file diff --git a/ansible/test/play-rke/molecule/helm3/playbook.yml b/ansible/test/play-rke/molecule/helm3/playbook.yml deleted file mode 120000 index a3e26797..00000000 --- a/ansible/test/play-rke/molecule/helm3/playbook.yml +++ /dev/null @@ -1 +0,0 @@ -../default/playbook.yml
\ No newline at end of file |