summaryrefslogtreecommitdiffstats
path: root/ansible/test/roles/prepare-common
diff options
context:
space:
mode:
authorMichal Zegan <m.zegan@samsung.com>2019-05-22 17:53:00 +0200
committerSamuli Silvius <s.silvius@partner.samsung.com>2019-05-30 10:52:57 +0000
commita83ae84c589effcd690180347294ceaa677c2c7b (patch)
treece46dbcd3cb9d44603e60b74df1bde14e54c08c6 /ansible/test/roles/prepare-common
parent7e5ddf0b3e0f23bf499b3311340253485d06fc33 (diff)
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>
Diffstat (limited to 'ansible/test/roles/prepare-common')
-rw-r--r--ansible/test/roles/prepare-common/tasks/main.yml33
1 files changed, 3 insertions, 30 deletions
diff --git a/ansible/test/roles/prepare-common/tasks/main.yml b/ansible/test/roles/prepare-common/tasks/main.yml
index 11dcbe71..909d58c9 100644
--- a/ansible/test/roles/prepare-common/tasks/main.yml
+++ b/ansible/test/roles/prepare-common/tasks/main.yml
@@ -1,31 +1,4 @@
---
-- name: Fetch docker host ip
- block:
- - name: Get docker host ip to access host where container running (as dood)
- shell: |
- set -o pipefail
- ip route | awk '/default/ { print $3 }'
- args:
- executable: /bin/bash
- register: ip
- changed_when: false
-
- - name: "set docker host ip {{ ip.stdout }} for cluster_ip"
- set_fact:
- cluster_ip: "{{ ip.stdout }}"
- when: inventory_hostname != 'localhost'
-
-- name: Set fact for localhost OS
- block:
- - name: set localhost fact
- set_fact:
- localhost_ansible_os_family: "{{ hostvars['localhost'].ansible_os_family }}"
-
- - name: debug
- debug:
- var: localhost_ansible_os_family
- when: hostvars['localhost'].ansible_os_family is defined
-
-- name: debug
- debug:
- var: ansible_os_family \ No newline at end of file
+- name: "Set cluster_ip fact"
+ set_fact:
+ cluster_ip: "{{ ansible_default_ipv4.address }}"