diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-01-04 14:20:03 +0100 |
|---|---|---|
| committer | Michal Zegan <m.zegan@samsung.com> | 2019-01-17 15:19:21 +0100 |
| commit | b5cd82b2ec6f4fe69eae27f70eb3b5eda52da368 (patch) | |
| tree | 060acfd9bd4241bb1755fbde9c2ad1a7150f39b0 | |
| parent | cde2f33dfcd9728240d37c80383534a5b6af5caf (diff) | |
Fix docker config handling in offline installer
This fixes adding of dns address to
/etc/docker/daemon.json to always use infra's ip address
instead of possibly using it's hostname.
Also similar change is done in handling of
/etc/resolv.conf in infrastructure.yml.
Ip address is specified by the "cluster_ip" variable placed on a host.
Inventory specifies ip for everything except resource server (just for consistency).
Change-Id: I2baa3f4c7d69b8dff109b5f8ae984134caf2af7d
Issue-ID: OOM-1573
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
| -rw-r--r-- | ansible/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | ansible/infrastructure.yml | 2 | ||||
| -rw-r--r-- | ansible/inventory/hosts.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/docker/tasks/main.yml | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/ansible/docker/Dockerfile b/ansible/docker/Dockerfile index b0172709..4cefa8b7 100644 --- a/ansible/docker/Dockerfile +++ b/ansible/docker/Dockerfile @@ -24,6 +24,7 @@ RUN apk --no-cache update \ && pip3 install --no-cache-dir \ ansible==$ansible_version \ jmespath \ + netaddr \ && apk del build-dependencies && rm -rf /var/cache/apk/* ENV ANSIBLE_HOST_KEY_CHECKING false diff --git a/ansible/infrastructure.yml b/ansible/infrastructure.yml index 789f8716..709a351e 100644 --- a/ansible/infrastructure.yml +++ b/ansible/infrastructure.yml @@ -4,7 +4,7 @@ tasks: - name: Setup resolv.conf lineinfile: - line: "nameserver {{ hostvars[groups.infrastructure[0]].ansible_host }}" + line: "nameserver {{ hostvars[groups.infrastructure[0]].cluster_ip }}" path: /etc/resolv.conf state: present insertbefore: BOF diff --git a/ansible/inventory/hosts.yml b/ansible/inventory/hosts.yml index f11ef7b1..a29072c5 100644 --- a/ansible/inventory/hosts.yml +++ b/ansible/inventory/hosts.yml @@ -20,12 +20,16 @@ all: hosts: infrastructure-server: ansible_host: 10.8.8.13 + #IP used for communication between infra and kubernetes nodes, must be specified. + cluster_ip: 10.8.8.13 # This is group of hosts which are/will be part of Kubernetes cluster. kubernetes: hosts: kubernetes-node-1: ansible_host: 10.8.8.19 + #ip of the node that it uses for communication with k8s cluster. + cluster_ip: 10.8.8.19 nfs-server: hosts: diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 9851d4dc..09e790a4 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -20,7 +20,7 @@ json_add: path: /etc/docker/daemon.json key: dns - value: "{{ hostvars[groups.infrastructure[0]].ansible_default_ipv4.address }}" + value: "{{ hostvars[groups.infrastructure[0]].cluster_ip }}" notify: - Restart Docker |