[MOLECULE 3.3.0] Update converge playbook file names

In 3.x.x version family of Molecule the 'playbook.yml' file for 'converge' action has changed to 'converge.yml'. Ref.: ansible/molecule#2560 Change-Id: I8710ebd5710237be138f2aff8943d6c949058dbd Issue-ID: OOM-2722 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
onap · Apr 8, 2021 · d0f80fd · d0f80fd
1 parent 018a6ab
commit d0f80fd
Show file tree

Hide file tree

Showing 48 changed files with 22 additions and 22 deletions.
diff --git 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/...application/molecule/default/playbook.yml → ...application/molecule/default/converge.yml b/...application/molecule/default/playbook.yml → ...application/molecule/default/converge.yml
diff --git 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
@@ -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/...ertificates/molecule/default/playbook.yml → ...ertificates/molecule/default/converge.yml b/...ertificates/molecule/default/playbook.yml → ...ertificates/molecule/default/converge.yml
diff --git 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/...chartmuseum/molecule/default/playbook.yml → ...chartmuseum/molecule/default/converge.yml b/...chartmuseum/molecule/default/playbook.yml → ...chartmuseum/molecule/default/converge.yml
diff --git 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/...oles/chrony/molecule/default/playbook.yml → ...oles/chrony/molecule/default/converge.yml b/...oles/chrony/molecule/default/playbook.yml → ...oles/chrony/molecule/default/converge.yml
diff --git a/...olecule/external_time_source/playbook.yml → ...olecule/external_time_source/converge.yml b/...olecule/external_time_source/playbook.yml → ...olecule/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
@@ -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
@@ -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/...e/roles/dns/molecule/default/playbook.yml → ...e/roles/dns/molecule/default/converge.yml b/...e/roles/dns/molecule/default/playbook.yml → ...e/roles/dns/molecule/default/converge.yml
diff --git 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/...oles/docker/molecule/default/playbook.yml → ...oles/docker/molecule/default/converge.yml b/...oles/docker/molecule/default/playbook.yml → ...oles/docker/molecule/default/converge.yml
diff --git 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/...es/firewall/molecule/default/playbook.yml → ...es/firewall/molecule/default/converge.yml b/...es/firewall/molecule/default/playbook.yml → ...es/firewall/molecule/default/converge.yml
diff --git a/.../roles/helm/molecule/default/playbook.yml → .../roles/helm/molecule/default/converge.yml b/.../roles/helm/molecule/default/playbook.yml → .../roles/helm/molecule/default/converge.yml
diff --git a/ansible/roles/helm/molecule/helm3/converge.yml b/ansible/roles/helm/molecule/helm3/converge.yml
@@ -0,0 +1 @@
+../default/converge.yml
diff --git a/ansible/roles/helm/molecule/helm3/playbook.yml b/ansible/roles/helm/molecule/helm3/playbook.yml
diff --git 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/...les/kubectl/molecule/default/playbook.yml → ...les/kubectl/molecule/default/converge.yml b/...les/kubectl/molecule/default/playbook.yml → ...les/kubectl/molecule/default/converge.yml
diff --git 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/...roles/nexus/molecule/default/playbook.yml → ...roles/nexus/molecule/default/converge.yml b/...roles/nexus/molecule/default/playbook.yml → ...roles/nexus/molecule/default/converge.yml
diff --git 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/...e/roles/nfs/molecule/default/playbook.yml → ...e/roles/nfs/molecule/default/converge.yml b/...e/roles/nfs/molecule/default/playbook.yml → ...e/roles/nfs/molecule/default/converge.yml
diff --git 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/...roles/nginx/molecule/default/playbook.yml → ...roles/nginx/molecule/default/converge.yml b/...roles/nginx/molecule/default/playbook.yml → ...roles/nginx/molecule/default/converge.yml
diff --git 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/...itory-check/molecule/default/playbook.yml → ...itory-check/molecule/default/converge.yml b/...itory-check/molecule/default/playbook.yml → ...itory-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
@@ -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/...-repository/molecule/default/playbook.yml → ...-repository/molecule/default/converge.yml b/...-repository/molecule/default/playbook.yml → ...-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
@@ -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/...les/rancher/molecule/default/playbook.yml → ...les/rancher/molecule/default/converge.yml b/...les/rancher/molecule/default/playbook.yml → ...les/rancher/molecule/default/converge.yml
diff --git a/...source-data/molecule/default/playbook.yml → ...source-data/molecule/default/converge.yml b/...source-data/molecule/default/playbook.yml → ...source-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
@@ -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/...e/roles/rke/molecule/default/playbook.yml → ...e/roles/rke/molecule/default/converge.yml b/...e/roles/rke/molecule/default/playbook.yml → ...e/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
@@ -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/...roles/setup/molecule/default/playbook.yml → ...roles/setup/molecule/default/converge.yml b/...roles/setup/molecule/default/playbook.yml → ...roles/setup/molecule/default/converge.yml
diff --git 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/...s/vncserver/molecule/default/playbook.yml → ...s/vncserver/molecule/default/converge.yml b/...s/vncserver/molecule/default/playbook.yml → ...s/vncserver/molecule/default/converge.yml
diff --git 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/...rastructure/molecule/default/playbook.yml → ...rastructure/molecule/default/converge.yml b/...rastructure/molecule/default/playbook.yml → ...rastructure/molecule/default/converge.yml
diff --git a/...y-resources/molecule/default/playbook.yml → ...y-resources/molecule/default/converge.yml b/...y-resources/molecule/default/playbook.yml → ...y-resources/molecule/default/converge.yml
diff --git a/.../play-resources/molecule/nfs/playbook.yml → .../play-resources/molecule/nfs/converge.yml b/.../play-resources/molecule/nfs/playbook.yml → .../play-resources/molecule/nfs/converge.yml
diff --git a/...st/play-rke/molecule/default/playbook.yml → ...st/play-rke/molecule/default/converge.yml b/...st/play-rke/molecule/default/playbook.yml → ...st/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
@@ -0,0 +1 @@
+../default/converge.yml
diff --git a/ansible/test/play-rke/molecule/helm3/playbook.yml b/ansible/test/play-rke/molecule/helm3/playbook.yml