summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorMichal Zegan <m.zegan@samsung.com>2019-06-19 14:41:38 +0200
committerMichal Zegan <m.zegan@samsung.com>2019-07-05 13:39:49 +0200
commit0ca158b61574f50d16b9e472d29ee1f3e2d19dfa (patch)
tree66e240a7e111b604825c03016ab1a56ef192842f /ansible
parent88935caf1c0ef81928bdbfdc256842aa0c17d38a (diff)
Specify source ip for rancher agent
This change explicitly sets cluster_ip as rancher agent source ip. This avoids eventual problems with ip autodetection, especially that we know the correct ip. Change-Id: I473f022c56301cefeb98ccb5bb94d78e7ac491a7 Issue-ID: OOM-1906 Signed-off-by: Michal Zegan <m.zegan@samsung.com>
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/rancher/molecule/default/playbook.yml1
-rw-r--r--ansible/roles/rancher/tasks/rancher_agent.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/ansible/roles/rancher/molecule/default/playbook.yml b/ansible/roles/rancher/molecule/default/playbook.yml
index 436f2ff4..afdbb4af 100644
--- a/ansible/roles/rancher/molecule/default/playbook.yml
+++ b/ansible/roles/rancher/molecule/default/playbook.yml
@@ -10,6 +10,7 @@
- name: Converge rancher agent
hosts: kubernetes
roles:
+ - prepare-common
- role: rancher
vars:
mode: agent
diff --git a/ansible/roles/rancher/tasks/rancher_agent.yml b/ansible/roles/rancher/tasks/rancher_agent.yml
index 73d9a642..e54d760e 100644
--- a/ansible/roles/rancher/tasks/rancher_agent.yml
+++ b/ansible/roles/rancher/tasks/rancher_agent.yml
@@ -4,6 +4,8 @@
name: rancher_agent
image: "{{ server_hostvars.rancher_agent_image }}"
command: "{{ server_hostvars.rancher_agent_reg_url }}"
+ env:
+ CATTLE_AGENT_IP: "{{ cluster_ip }}"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- "/var/lib/rancher:/var/lib/rancher"