From 073cfb2a334ce8869648009d4c33137bf711c91b Mon Sep 17 00:00:00 2001 From: Vladislav Belogrudov Date: Thu, 15 Dec 2016 12:37:18 +0300 Subject: [PATCH] Some tasks fail if NIC names differ During configuration file generation one uses local variable api_interface that reference remote host. Instead we should use hostvars to find out correct interface name for each host mentioned in configuration. Change-Id: I9f64fdf2cd18bcc0bbf1c4193349186d9a7658bc Closes-Bug: #1650195 --- ansible/roles/etcd/tasks/start.yml | 2 +- ansible/roles/mongodb/templates/bootstrap_cluster.js.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/etcd/tasks/start.yml b/ansible/roles/etcd/tasks/start.yml index 7546f8841d..9b23eaf518 100644 --- a/ansible/roles/etcd/tasks/start.yml +++ b/ansible/roles/etcd/tasks/start.yml @@ -11,7 +11,7 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}" ETCD_LISTEN_PEER_URLS: "{{ internal_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}" ETCD_INITIAL_CLUSTER_TOKEN: "{{ etcd_cluster_token }}" - ETCD_INITIAL_CLUSTER: "{% for host in groups['etcd'] %}{{ hostvars[host]['ansible_hostname'] }}={{ internal_protocol }}://{{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}{% endfor %}" + ETCD_INITIAL_CLUSTER: "{% for host in groups['etcd'] %}{{ hostvars[host]['ansible_hostname'] }}={{ internal_protocol }}://{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}{% endfor %}" ETCD_INITIAL_CLUSTER_STATE: "new" ETCD_OUT_FILE: "/var/log/kolla/etcd/etcd.log" KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" diff --git a/ansible/roles/mongodb/templates/bootstrap_cluster.js.j2 b/ansible/roles/mongodb/templates/bootstrap_cluster.js.j2 index 05ea1c655a..d52b66fdb0 100644 --- a/ansible/roles/mongodb/templates/bootstrap_cluster.js.j2 +++ b/ansible/roles/mongodb/templates/bootstrap_cluster.js.j2 @@ -6,7 +6,7 @@ printjson(rs.initiate( {% for host in groups["mongodb"] %} { "_id" : {{ loop.index }}, - "host" : "{{ hostvars[host]['ansible_' + storage_interface]['ipv4']['address'] }}:{{ mongodb_port }}" + "host" : "{{ hostvars[host]['ansible_' + hostvars[host]['storage_interface']]['ipv4']['address'] }}:{{ mongodb_port }}" }{% if not loop.last %},{% endif %} {% endfor %} ]