From 4155ef0c478c4eb5513439dabd5553bf389d1803 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 9 Aug 2017 15:20:24 +0800 Subject: Fix bug in apex inventory The default user for overcloud should be heat-admin JIRA: QTIP-267 Change-Id: Ie868b1a925ca0eaa0292bdfb99d0e328e820f8aa Signed-off-by: Yujun Zhang --- qtip/ansible_library/modules/apex_generate_inventory.py | 3 ++- qtip/ansible_library/modules/fuel.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'qtip/ansible_library') diff --git a/qtip/ansible_library/modules/apex_generate_inventory.py b/qtip/ansible_library/modules/apex_generate_inventory.py index b1cc976d..0c9500f1 100644 --- a/qtip/ansible_library/modules/apex_generate_inventory.py +++ b/qtip/ansible_library/modules/apex_generate_inventory.py @@ -79,7 +79,8 @@ def generate_inventory(baremetal_info, server_info): node_ip = re.findall('.+=(\d+.\d+.\d+.\d+)$', server['Networks'])[0] hosts[role].append(node_ip) # To match ssh.cfg.j2 template - hosts_meta[node_ip] = {'ansible_ssh_host': node_ip} + hosts_meta[node_ip] = {'ansible_ssh_host': node_ip, + 'ansible_user': 'heat-admin'} for host in hosts: hosts[host].sort() diff --git a/qtip/ansible_library/modules/fuel.py b/qtip/ansible_library/modules/fuel.py index 5ec45dd1..04154e34 100644 --- a/qtip/ansible_library/modules/fuel.py +++ b/qtip/ansible_library/modules/fuel.py @@ -98,7 +98,8 @@ def generate_inventory(nodes): 'ip': node['ip'], 'mac': node['mac'], 'cluster': cluster_id, - 'ansible_ssh_host': node['ip'] + 'ansible_ssh_host': node['ip'], + 'ansible_user': 'root' } hosts_meta[hostname] = node_meta -- cgit 1.2.3-korg