diff options
| -rw-r--r-- | qtip/ansible_library/modules/fuel.py | 1 | ||||
| -rw-r--r-- | resources/template/hosts.j2 | 3 | ||||
| -rw-r--r-- | tests/integration/hosts.default | 2 | ||||
| -rw-r--r-- | tests/integration/run.yaml | 4 | ||||
| -rw-r--r-- | tests/unit/ansible_library/modules/fuel_test.py | 8 |
5 files changed, 3 insertions, 15 deletions
diff --git a/qtip/ansible_library/modules/fuel.py b/qtip/ansible_library/modules/fuel.py index ea2d78b9..5ec45dd1 100644 --- a/qtip/ansible_library/modules/fuel.py +++ b/qtip/ansible_library/modules/fuel.py @@ -100,7 +100,6 @@ def generate_inventory(nodes): 'cluster': cluster_id, 'ansible_ssh_host': node['ip'] } - hosts["node-{}".format(node['id'])].append(hostname) hosts_meta[hostname] = node_meta return {'hosts': hosts, 'hosts_meta': hosts_meta} diff --git a/resources/template/hosts.j2 b/resources/template/hosts.j2 index 868a4e57..2ebf3c8b 100644 --- a/resources/template/hosts.j2 +++ b/resources/template/hosts.j2 @@ -1,7 +1,4 @@ -[fuel-master] fuel-master - -[local] localhost ansible_connection=local [fuel-groups:children] 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 f02ebf89..e715863f 100644 --- a/tests/integration/run.yaml +++ b/tests/integration/run.yaml @@ -39,7 +39,7 @@ delegate_to: localhost tags: [calculate] -- hosts: local +- hosts: localhost tasks: - name: aggregate QPI results from all tested nodes aggregate: @@ -48,7 +48,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', |