From a83ae84c589effcd690180347294ceaa677c2c7b Mon Sep 17 00:00:00 2001
From: Michal Zegan <m.zegan@samsung.com>
Date: Wed, 22 May 2019 17:53:00 +0200
Subject: Modify rancher molecule tests to use dind

This change modifies molecule tests of rancher role to
use prepare-docker-dind.
Also:
- it modifies prepare-common role to retrieve cluster_ip of the actual
node in question,
- it fixes the rancher role itself to work at all by removing auto_remove.
It has been tested by running molecule converge.

Change-Id: I7af4e9998feedd5f8fc3df8215e03c1b0485529c
Issue-ID: OOM-1864
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
---
 ansible/roles/rancher/molecule/default/cleanup.yml  | 14 --------------
 ansible/roles/rancher/molecule/default/molecule.yml |  9 +++++----
 ansible/roles/rancher/molecule/default/playbook.yml |  2 +-
 ansible/roles/rancher/molecule/default/prepare.yml  |  6 +++---
 ansible/roles/rancher/tasks/rancher_agent.yml       |  1 -
 5 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 ansible/roles/rancher/molecule/default/cleanup.yml

(limited to 'ansible/roles')

diff --git a/ansible/roles/rancher/molecule/default/cleanup.yml b/ansible/roles/rancher/molecule/default/cleanup.yml
deleted file mode 100644
index d4bf4495..00000000
--- a/ansible/roles/rancher/molecule/default/cleanup.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Cleanup host
-  hosts: localhost
-  roles:
-    - role: cleanup-containers
-      vars:
-        container_list:
-          - rancher-agent
-          - rancher-server
-    - role: cleanup-rancher
-      vars:
-        container_list_by_label:
-          - { 'label':'io.rancher.project.name', 'value':'healthcheck'}
-          - { 'label':'io.rancher.project.name', 'value':'kubernetes'}
diff --git a/ansible/roles/rancher/molecule/default/molecule.yml b/ansible/roles/rancher/molecule/default/molecule.yml
index b21325d4..eb7f8c19 100644
--- a/ansible/roles/rancher/molecule/default/molecule.yml
+++ b/ansible/roles/rancher/molecule/default/molecule.yml
@@ -13,8 +13,7 @@ platforms:
     override_command: false
     restart_policy: unless-stopped
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /var/lib/rancher:/var/lib/rancher:ro
+      - /var/lib/docker
     groups:
       - infrastructure
     networks:
@@ -27,12 +26,14 @@ platforms:
     override_command: false
     restart_policy: unless-stopped
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /var/lib/rancher:/var/lib/rancher:ro
+      - /var/lib/docker
+      - /var/lib/rancher
+      - /var/lib/kubelet
     groups:
       - kubernetes
     networks:
       - name: rancher
+    purge_networks: true
 
 provisioner:
   name: ansible
diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/playbook.yml
index e0ef086c..e4a7151e 100644
--- a/ansible/roles/rancher/molecule/default/playbook.yml
+++ b/ansible/roles/rancher/molecule/default/playbook.yml
@@ -2,7 +2,7 @@
 - name: Converge rancher master
   hosts: infrastructure
   roles:
-    - prepare-common  # molecule specific role needed here to populate cluster_ip
+    - prepare-common
     - role: rancher
       vars:
         mode: server
diff --git a/ansible/roles/rancher/molecule/default/prepare.yml b/ansible/roles/rancher/molecule/default/prepare.yml
index 90159c6c..d70cda43 100644
--- a/ansible/roles/rancher/molecule/default/prepare.yml
+++ b/ansible/roles/rancher/molecule/default/prepare.yml
@@ -1,5 +1,5 @@
 ---
-- name: Prepare kube nodes
-  hosts: kubernetes
+- name: Prepare hosts
+  hosts: all
   roles:
-    - prepare-docker
+    - prepare-docker-dind
diff --git a/ansible/roles/rancher/tasks/rancher_agent.yml b/ansible/roles/rancher/tasks/rancher_agent.yml
index 091503c7..73d9a642 100644
--- a/ansible/roles/rancher/tasks/rancher_agent.yml
+++ b/ansible/roles/rancher/tasks/rancher_agent.yml
@@ -7,7 +7,6 @@
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/var/lib/rancher:/var/lib/rancher"
-    auto_remove: true
     privileged: true
   vars:
     server_hostvars: "{{ hostvars[groups.infrastructure.0] }}"
-- 
cgit 1.2.3-korg