From 690decb9ce48a420691b143df22892516fad7607 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 18 Apr 2017 19:07:26 +0800
Subject: Fix warnings on same name of host and group in Ansible 2.3
Change-Id: Iedf0d609a62b956e1f0cd5e941a8fd27e1abc685
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
tests/integration/hosts.default | 2 --
tests/integration/run.yaml | 4 ++--
tests/unit/ansible_library/modules/fuel_test.py | 8 +-------
3 files changed, 3 insertions(+), 11 deletions(-)
(limited to 'tests')
diff --git a/tests/integration/hosts.default b/tests/integration/hosts.default
index 9b91eea6..65739726 100644
--- a/tests/integration/hosts.default
+++ b/tests/integration/hosts.default
@@ -1,6 +1,4 @@
-[fuel-master]
fuel-master
[local]
localhost ansible_connection=local
-
diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml
index 7545a65e..10428ac3 100644
--- a/tests/integration/run.yaml
+++ b/tests/integration/run.yaml
@@ -33,7 +33,7 @@
delegate_to: localhost
tags: [calculate]
-- hosts: local
+- hosts: localhost
tasks:
- name: aggregate QPI results from all tested nodes
aggregate:
@@ -42,7 +42,7 @@
# Generate and publish report
-- hosts: local
+- hosts: localhost
tasks:
- name: create report folder
file:
diff --git a/tests/unit/ansible_library/modules/fuel_test.py b/tests/unit/ansible_library/modules/fuel_test.py
index 6a440e0d..e004fc17 100644
--- a/tests/unit/ansible_library/modules/fuel_test.py
+++ b/tests/unit/ansible_library/modules/fuel_test.py
@@ -32,13 +32,7 @@ def test_generate_inventory(data_root):
u'node-28',
u'node-25',
u'node-27'],
- u'mongo': [u'node-24'],
- 'node-23': [u'node-23'],
- 'node-24': [u'node-24'],
- 'node-25': [u'node-25'],
- 'node-26': [u'node-26'],
- 'node-27': [u'node-27'],
- 'node-28': [u'node-28']}
+ u'mongo': [u'node-24']}
assert dict(inventory['hosts_meta']) == {
u'node-23': {'ansible_ssh_host': u'10.20.11.10', 'cluster': 4, 'ip': u'10.20.11.10',
'mac': u'74:4a:a4:01:71:61', 'name': u'Untitled (71:61)', 'online': True, 'os_platform': u'ubuntu',
--
cgit