[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.: https://github.com/ansible-community/molecule/issues/2560

Change-Id: I8710ebd5710237be138f2aff8943d6c949058dbd
Issue-ID: OOM-2722
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml
index 6000e0e..733ad18 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/application/molecule/default/playbook.yml
rename to 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 50e9cb8..8ca5fca 100644 (file)
--- 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 aa8151f..4252338 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/certificates/molecule/default/playbook.yml
rename to 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 9708bd9..aa51990 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/chartmuseum/molecule/default/playbook.yml
rename to 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 307988a..8b50ec5 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/chrony/molecule/default/playbook.yml
rename to 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
similarity index 100%
rename from ansible/roles/chrony/molecule/external_time_source/playbook.yml
rename to 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 0fbef39..8bdccee 100644 (file)
--- 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 a92dfa3..32aef6f 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/dns/molecule/default/playbook.yml
rename to 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 5621b73..ae763c2 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/docker/molecule/default/playbook.yml
rename to 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 751782a..a4705a1 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/firewall/molecule/default/playbook.yml
rename to 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
similarity index 100%
rename from ansible/roles/helm/molecule/default/playbook.yml
rename to 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 (symlink)
index 0000000..73cb8da
--- /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 (symlink)
index a3e2679..0000000
--- 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 9a97288..c4354e8 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/kubectl/molecule/default/playbook.yml
rename to 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 e9422fd..56edda1 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/nexus/molecule/default/playbook.yml
rename to 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 d882633..6925a9d 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/nfs/molecule/default/playbook.yml
rename to 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 61728cd..4cc5fb5 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/nginx/molecule/default/playbook.yml
rename to 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 d882633..6925a9d 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/package-repository-check/molecule/default/playbook.yml
rename to 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 23e7a61..3a1cf7c 100755 (executable)
--- 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
similarity index 100%
rename from ansible/roles/package-repository/molecule/default/playbook.yml
rename to 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 f32e649..23a45ef 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/rancher/molecule/default/playbook.yml
rename to 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
similarity index 100%
rename from ansible/roles/resource-data/molecule/default/playbook.yml
rename to 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 df886db..f60b02d 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/rke/molecule/default/playbook.yml
rename to 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 9c9bb9b..5c8a573 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/setup/molecule/default/playbook.yml
rename to 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 d0cce59..0d9b9c9 100644 (file)
--- 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
similarity index 100%
rename from ansible/roles/vncserver/molecule/default/playbook.yml
rename to 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 38dbe7f..604d736 100644 (file)
--- 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
similarity index 100%
rename from ansible/test/play-infrastructure/molecule/default/playbook.yml
rename to 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
similarity index 100%
rename from ansible/test/play-resources/molecule/default/playbook.yml
rename to 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
similarity index 100%
rename from ansible/test/play-resources/molecule/nfs/playbook.yml
rename to 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
similarity index 100%
rename from ansible/test/play-rke/molecule/default/playbook.yml
rename to 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 (symlink)
index 0000000..73cb8da
--- /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 (symlink)
index a3e2679..0000000
--- a/ansible/test/play-rke/molecule/helm3/playbook.yml
+++ /dev/null
@@ -1 +0,0 @@
-../default/playbook.yml
\ No newline at end of file