From d0f80fd8bc2954a7fb3fbef405d81ecf1574df5e Mon Sep 17 00:00:00 2001
From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Thu, 8 Apr 2021 16:41:16 +0200
Subject: [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>
---
 ansible/roles/helm/molecule/default/converge.yml | 10 ++++++++++
 ansible/roles/helm/molecule/default/playbook.yml | 10 ----------
 ansible/roles/helm/molecule/helm3/converge.yml   |  1 +
 ansible/roles/helm/molecule/helm3/playbook.yml   |  1 -
 ansible/roles/helm/molecule/ubuntu/molecule.yml  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 ansible/roles/helm/molecule/default/converge.yml
 delete mode 100644 ansible/roles/helm/molecule/default/playbook.yml
 create mode 120000 ansible/roles/helm/molecule/helm3/converge.yml
 delete mode 120000 ansible/roles/helm/molecule/helm3/playbook.yml

(limited to 'ansible/roles/helm')

diff --git a/ansible/roles/helm/molecule/default/converge.yml b/ansible/roles/helm/molecule/default/converge.yml
new file mode 100644
index 00000000..0f3fbc27
--- /dev/null
+++ b/ansible/roles/helm/molecule/default/converge.yml
@@ -0,0 +1,10 @@
+---
+- name: Converge
+  hosts: all
+  pre_tasks:
+    - name: Include infrastructure group variables
+      include_vars: ../../../../group_vars/infrastructure.yml
+    - name: Include test scenario variables
+      include_vars: vars.yml
+  roles:
+    - helm
diff --git a/ansible/roles/helm/molecule/default/playbook.yml b/ansible/roles/helm/molecule/default/playbook.yml
deleted file mode 100644
index 0f3fbc27..00000000
--- a/ansible/roles/helm/molecule/default/playbook.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Converge
-  hosts: all
-  pre_tasks:
-    - name: Include infrastructure group variables
-      include_vars: ../../../../group_vars/infrastructure.yml
-    - name: Include test scenario variables
-      include_vars: vars.yml
-  roles:
-    - helm
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:
-- 
cgit 1.2.3-korg