diff options
| author |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-09-26 08:08:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-26 08:08:49 +0000 |
| commit | 0a5a34ffe4b6506663a61372998f43657bf81230 (patch) | |
| tree | b312a45cad4dc581ccea9b4cf4a391cb15872253 /ansible/roles | |
| parent | ef1aef15d17eae648f9eaf720c85d9c1f3f5e97e (diff) | |
| parent | 4df25e7d379b09210810427f20a1da2b531fcc9a (diff) | |
Merge changes from topic "OOM-2112"
* changes:
Make cicdansible to set external ip
Use external_ip to populate the node address
Add external_ip variable
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/rke/templates/cluster.yml.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/rke/templates/cluster.yml.j2 b/ansible/roles/rke/templates/cluster.yml.j2 index 737d306f..51f4e28b 100644 --- a/ansible/roles/rke/templates/cluster.yml.j2 +++ b/ansible/roles/rke/templates/cluster.yml.j2 @@ -1,6 +1,6 @@ nodes: {% for node in groups['kubernetes'] %} -- address: "{{ hostvars[node].cluster_ip }}" +- address: "{{ hostvars[node].external_ip | default(hostvars[node].cluster_ip) }}" port: "22" internal_address: "{{ hostvars[node].cluster_ip }}" role: @@ -13,7 +13,7 @@ nodes: {% if node in groups['kubernetes-etcd'] %} - etcd {% endif %} - hostname_override: "" + hostname_override: "{{ node }}" user: "{{ rke_username }}" docker_socket: /var/run/docker.sock ssh_key: "" |