From d79b213302189ffd78d64bc6205b6acc851198de Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Fri, 9 Feb 2018 19:40:18 +0300
Subject: [PATCH] Deploy of keystone fails if api_interface names differ

If control hosts have different names of interfaces one can set
api_interface variables per host. Deployment of keystone fails
because rpc_transport_url and notify_transport_url variables
use bare api_interface instead of one from hostvars.

Change-Id: I8bb4aa2953cf4ba63ef6815f2504d35e5aa0a07b
Closes-Bug: #1748473
---
 ansible/group_vars/all.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 374cd38cff..f547cec0d7 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -133,7 +133,7 @@ om_rpc_password: "{{ rabbitmq_password }}"
 om_rpc_port: "{{ rabbitmq_port }}"
 om_rpc_group: "rabbitmq"
 
-rpc_transport_url: "{{ om_rpc_transport }}://{% for host in groups[om_rpc_group] %}{{ om_rpc_user }}:{{ om_rpc_password }}@{{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ om_rpc_port }}{% if not loop.last %},{% endif %}{% endfor %}"
+rpc_transport_url: "{{ om_rpc_transport }}://{% for host in groups[om_rpc_group] %}{{ om_rpc_user }}:{{ om_rpc_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ om_rpc_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 # oslo.messaging notify transport valid options are [ rabbit ]
 om_notify_transport: "rabbit"
@@ -142,7 +142,7 @@ om_notify_password: "{{ rabbitmq_password }}"
 om_notify_port: "{{ rabbitmq_port }}"
 om_notify_group: "rabbitmq"
 
-notify_transport_url: "{{ om_notify_transport }}://{% for host in groups[om_notify_group] %}{{ om_notify_user }}:{{ om_notify_password }}@{{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ om_notify_port }}{% if not loop.last %},{% endif %}{% endfor %}"
+notify_transport_url: "{{ om_notify_transport }}://{% for host in groups[om_notify_group] %}{{ om_notify_user }}:{{ om_notify_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ om_notify_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 ####################
 # Networking options