diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-02-04 10:54:07 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-02-04 10:56:30 +0000 |
| commit | 9f0255d0406619f570d99eb432096672010c8ff1 (patch) | |
| tree | 1bdbdf65cc2f1d8c2265f43d76c96049b1eba87a /ansible/test | |
| parent | bcc82e6bba9f27d4720571e65a7e7180defe73ce (diff) | |
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>
Diffstat (limited to 'ansible/test')
| -rw-r--r-- | ansible/test/play-rke/molecule/default/molecule.yml | 16 | ||||
| -rw-r--r-- | ansible/test/play-rke/molecule/helm3/molecule.yml | 14 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-rke/tasks/all.yml | 7 |
3 files changed, 1 insertions, 36 deletions
diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml index b7e71bf5..519679a5 100644 --- 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 b2ff9b88..83a2fd20 100644 --- 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 7f876ff3..a259577c 100644 --- 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 |