diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-05-10 17:40:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-10 17:40:58 +0000 |
| commit | e7fd64586455a7c1270c1b1c846c19e030780315 (patch) | |
| tree | ad3d88f2048ad743b4ef5972ab26b8d701b01966 /ansible | |
| parent | 45550572193ba5f91ec045c25e073b4f65a86dd4 (diff) | |
| parent | ce961a3e63e15658a10c4a9af7c63f5f5b119120 (diff) | |
Merge "Don't set 'container' env in Molecule containers"
Diffstat (limited to 'ansible')
5 files changed, 2 insertions, 12 deletions
diff --git a/ansible/roles/certificates/handlers/main.yml b/ansible/roles/certificates/handlers/main.yml index b2b81223..579b5228 100644 --- 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 50c862b7..a9e87cb5 100644 --- 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 b918187d..df50b693 100644 --- 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 7754d273..d1f67d75 100644 --- 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 e6152d55..b21325d4 100644 --- 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 |