Don't set 'container' env in Molecule containers

Molecule role tests that use pre build images had
superfluous 'container' env variable declaration.
It's not needed as this env is already set in
Dockerfiles, for both: pre-built and custom built
images.

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

diff --git a/ansible/roles/certificates/handlers/main.yml b/ansible/roles/certificates/handlers/main.yml
index b2b8122..579b522 100644 (file)
--- a/ansible/roles/certificates/handlers/main.yml
+++ b/ansible/roles/certificates/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 - name: Extract root certificate
   command: /usr/bin/update-ca-trust extract
-  changed_when: true # this handler is executed just when there is a new cert
+  changed_when: true  # this handler is executed just when there is a new cert
   notify: Restart Docker

diff --git a/ansible/roles/certificates/molecule/default/molecule.yml b/ansible/roles/certificates/molecule/default/molecule.yml
index 50c862b..a9e87cb 100644 (file)
--- a/ansible/roles/certificates/molecule/default/molecule.yml
+++ b/ansible/roles/certificates/molecule/default/molecule.yml
@@ -11,8 +11,6 @@ platforms:
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
-    env:
-      container: docker
     groups:
       - infrastructure
 
@@ -21,8 +19,6 @@ platforms:
     pre_build_image: true
     privileged: true
     command: ${MOLECULE_DOCKER_COMMAND:-""}
-    env:
-      container: docker
     groups:
       - kubernetes
 provisioner:

diff --git a/ansible/roles/certificates/tasks/upload_root_ca.yml b/ansible/roles/certificates/tasks/upload_root_ca.yml
index b918187..df50b69 100644 (file)
--- a/ansible/roles/certificates/tasks/upload_root_ca.yml
+++ b/ansible/roles/certificates/tasks/upload_root_ca.yml
@@ -3,5 +3,5 @@
   copy:
     src: "{{ certificates_local_dir }}/rootCA.crt"
     dest: /etc/pki/ca-trust/source/anchors/
-  notify: # handler is triggered just when file is changed
+  notify:  # handler is triggered just when file is changed
     - Extract root certificate

diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml
index 7754d27..d1f67d7 100644 (file)
--- a/ansible/roles/docker/molecule/default/molecule.yml
+++ b/ansible/roles/docker/molecule/default/molecule.yml
@@ -13,8 +13,6 @@ platforms:
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     groups:
       - infrastructure
-    env:
-      container: docker
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
       - /dev:/dev:ro

diff --git a/ansible/roles/rancher/molecule/default/molecule.yml b/ansible/roles/rancher/molecule/default/molecule.yml
index e6152d5..b21325d 100644 (file)
--- a/ansible/roles/rancher/molecule/default/molecule.yml
+++ b/ansible/roles/rancher/molecule/default/molecule.yml
@@ -12,8 +12,6 @@ platforms:
     privileged: true
     override_command: false
     restart_policy: unless-stopped
-    env:
-      container: docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/rancher:/var/lib/rancher:ro
@@ -28,8 +26,6 @@ platforms:
     privileged: true
     override_command: false
     restart_policy: unless-stopped
-    env:
-      container: docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/rancher:/var/lib/rancher:ro