From d7927502fed8ad19ef5d27f688e0a1cc17b60a4b 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>
---
 .../roles/rancher/molecule/default/converge.yml    | 28 ++++++++++++++++++++++
 .../roles/rancher/molecule/default/playbook.yml    | 28 ----------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 ansible/roles/rancher/molecule/default/converge.yml
 delete mode 100644 ansible/roles/rancher/molecule/default/playbook.yml

(limited to 'ansible/roles/rancher')

diff --git a/ansible/roles/rancher/molecule/default/converge.yml b/ansible/roles/rancher/molecule/default/converge.yml
new file mode 100644
index 00000000..afdbb4af
--- /dev/null
+++ b/ansible/roles/rancher/molecule/default/converge.yml
@@ -0,0 +1,28 @@
+---
+- name: Converge rancher master
+  hosts: infrastructure
+  roles:
+    - prepare-common
+    - role: rancher
+      vars:
+        mode: server
+
+- name: Converge rancher agent
+  hosts: kubernetes
+  roles:
+    - prepare-common
+    - role: rancher
+      vars:
+        mode: agent
+
+- name: Wait for Kubernetes environment to be healthy
+  hosts: infrastructure
+  roles:
+    - role: rancher
+      vars:
+        mode: health
+        rancher_server_url: "http://{{ cluster_ip }}:8080"
+        # Do not get rancher cluster healthy in this env (to be checked),
+        # but it's enough in molecule test to verify we get this unhealthy response
+        rancher_cluster_health_state: unhealthy
+        rancher_cluster_health_check_retries: 40
diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/playbook.yml
deleted file mode 100644
index afdbb4af..00000000
--- a/ansible/roles/rancher/molecule/default/playbook.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: Converge rancher master
-  hosts: infrastructure
-  roles:
-    - prepare-common
-    - role: rancher
-      vars:
-        mode: server
-
-- name: Converge rancher agent
-  hosts: kubernetes
-  roles:
-    - prepare-common
-    - role: rancher
-      vars:
-        mode: agent
-
-- name: Wait for Kubernetes environment to be healthy
-  hosts: infrastructure
-  roles:
-    - role: rancher
-      vars:
-        mode: health
-        rancher_server_url: "http://{{ cluster_ip }}:8080"
-        # Do not get rancher cluster healthy in this env (to be checked),
-        # but it's enough in molecule test to verify we get this unhealthy response
-        rancher_cluster_health_state: unhealthy
-        rancher_cluster_health_check_retries: 40
-- 
cgit 1.2.3-korg