Drop DIND specific test env settings for 'rke' role/playbook

DIND usage was already dropped so those settings are no longer
required.

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

diff --git a/ansible/roles/rke/molecule/default/molecule.yml b/ansible/roles/rke/molecule/default/molecule.yml
index 6da9e83..2e25531 100644 (file)
--- a/ansible/roles/rke/molecule/default/molecule.yml
+++ b/ansible/roles/rke/molecule/default/molecule.yml
@@ -11,39 +11,19 @@ platforms:
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/kubelet
-      - /var/lib/docker
-    env:
-      container: docker
     groups:
       - infrastructure
       - kubernetes-etcd
       - kubernetes-control-plane
       - kubernetes
-    networks:
-      - name: rke
-    purge_networks: true
-
   - name: kubernetes-node-1
     image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    env:
-      container: docker
-    volumes:
-      - /var/lib/kubelet
-      - /var/lib/docker
     groups:
       - kubernetes
       - kubernetes-node
-    networks:
-      - name: rke
-    purge_networks: true
-
 provisioner:
   name: ansible
   env:

diff --git a/ansible/roles/rke/molecule/etcd_storage/molecule.yml b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
index a68ceb9..bff115e 100644 (file)
--- a/ansible/roles/rke/molecule/etcd_storage/molecule.yml
+++ b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
@@ -11,39 +11,19 @@ platforms:
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/kubelet
-      - /var/lib/docker
-    env:
-      container: docker
     groups:
       - infrastructure
       - kubernetes-etcd
       - kubernetes-control-plane
       - kubernetes
-    networks:
-      - name: rke
-    purge_networks: true
-
   - name: kubernetes-node-1
     image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    env:
-      container: docker
-    volumes:
-      - /var/lib/kubelet
-      - /var/lib/docker
     groups:
       - kubernetes
       - kubernetes-node
-    networks:
-      - name: rke
-    purge_networks: true
-
 provisioner:
   name: ansible
   env:

diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml
index b7e71bf..519679a 100644 (file)
--- a/ansible/test/play-rke/molecule/default/molecule.yml
+++ b/ansible/test/play-rke/molecule/default/molecule.yml
@@ -11,35 +11,19 @@ platforms:
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/docker
-      - /var/lib/kubelet
     groups:
       - infrastructure
       - kubernetes-etcd
       - kubernetes-control-plane
       - kubernetes
-    networks:
-      - name: rke
-    purge_networks: true
-
   - name: kubernetes-node-1
     image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/docker
-      - /var/lib/kubelet
     groups:
       - kubernetes
       - kubernetes-node
-    networks:
-      - name: rke
-    purge_networks: true
-
 provisioner:
   name: ansible
   env:

diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml
index b2ff9b8..83a2fd2 100644 (file)
--- a/ansible/test/play-rke/molecule/helm3/molecule.yml
+++ b/ansible/test/play-rke/molecule/helm3/molecule.yml
@@ -11,33 +11,19 @@ platforms:
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/docker
-      - /var/lib/kubelet
     groups:
       - infrastructure
       - kubernetes-etcd
       - kubernetes-control-plane
       - kubernetes
-    networks:
-      - name: rke
-    purge_networks: true
   - name: kubernetes-node-1
     image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6}
     pre_build_image: true
     privileged: true
     override_command: false
-    restart_policy: unless-stopped
-    volumes:
-      - /var/lib/docker
-      - /var/lib/kubelet
     groups:
       - kubernetes
       - kubernetes-node
-    networks:
-      - name: rke
-    purge_networks: true
 provisioner:
   name: ansible
   env:

diff --git a/ansible/test/roles/prepare-rke/tasks/all.yml b/ansible/test/roles/prepare-rke/tasks/all.yml
index 7f876ff..a259577 100644 (file)
--- a/ansible/test/roles/prepare-rke/tasks/all.yml
+++ b/ansible/test/roles/prepare-rke/tasks/all.yml
@@ -1,9 +1,4 @@
-#This is needed because login from non root is blocked by default.
-- name: "Allow non root logins"
-  service:
-    name: systemd-user-sessions
-    state: started
-
+---
 - name: "Add docker group"
   group:
     name: docker