From 0ca158b61574f50d16b9e472d29ee1f3e2d19dfa Mon Sep 17 00:00:00 2001 From: Michal Zegan Date: Wed, 19 Jun 2019 14:41:38 +0200 Subject: 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 --- ansible/roles/rancher/molecule/default/playbook.yml | 1 + ansible/roles/rancher/tasks/rancher_agent.yml | 2 ++ 2 files changed, 3 insertions(+) (limited to 'ansible') 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" -- cgit 1.2.3-korg From cb5c09e2c322a05cb4ae9b1582e24d07f574b1bc Mon Sep 17 00:00:00 2001 From: Michal Zegan Date: Wed, 19 Jun 2019 14:45:15 +0200 Subject: Allow overriding docker version in prepare-docker-dind This change allows overriding of docker version to be installed when calling prepare-docker-dind role. It also enables downgrading, allowing the given version to be taken into account. Previously the specified version was completely ignored. Change-Id: Iee3827564f130498e9fad69ddea55278346b7cfe Issue-ID: OOM-1906 Signed-off-by: Michal Zegan --- ansible/test/roles/prepare-docker-dind/defaults/main.yml | 2 ++ ansible/test/roles/prepare-docker-dind/tasks/main.yml | 1 + ansible/test/roles/prepare-docker-dind/vars/main.yml | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 ansible/test/roles/prepare-docker-dind/vars/main.yml (limited to 'ansible') diff --git a/ansible/test/roles/prepare-docker-dind/defaults/main.yml b/ansible/test/roles/prepare-docker-dind/defaults/main.yml index 2489014e..147a828a 100644 --- a/ansible/test/roles/prepare-docker-dind/defaults/main.yml +++ b/ansible/test/roles/prepare-docker-dind/defaults/main.yml @@ -1,3 +1,5 @@ --- # Variable specifying if we should install docker, or only prepare for it start_docker: true +#The version of docker to install +docker_version: 18.09.5 diff --git a/ansible/test/roles/prepare-docker-dind/tasks/main.yml b/ansible/test/roles/prepare-docker-dind/tasks/main.yml index 3e109e87..c0bf1543 100644 --- a/ansible/test/roles/prepare-docker-dind/tasks/main.yml +++ b/ansible/test/roles/prepare-docker-dind/tasks/main.yml @@ -20,4 +20,5 @@ package: name: "docker-ce-{{ docker_version }}" state: present + allow_downgrade: true notify: Restart docker diff --git a/ansible/test/roles/prepare-docker-dind/vars/main.yml b/ansible/test/roles/prepare-docker-dind/vars/main.yml deleted file mode 100644 index 950fb921..00000000 --- a/ansible/test/roles/prepare-docker-dind/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -#The version of docker to install -docker_version: 18.09.5 -- cgit 1.2.3-korg