Merge "Fix ansible warning group and host with same name"

2018-02-13 20:50:09 +00:00 · 2018-02-13 20:50:09 +00:00 · 130afa5400
parent 26c174ea28 32e9d3ee84
commit 130afa5400
2 changed files with 1 additions and 2 deletions
--- a/roles/tripleo-inventory/tasks/inventory.yml
+++ b/roles/tripleo-inventory/tasks/inventory.yml
@ -85,7 +85,6 @@
 - name: Add undercloud vm to inventory
  add_host:
    name: undercloud
-    groups: undercloud
    ansible_host: '{{ undercloud_ip }}'
    ansible_fqdn: undercloud
    ansible_user: '{{ undercloud_user }}'
--- a/roles/tripleo-inventory/templates/inventory.j2
+++ b/roles/tripleo-inventory/templates/inventory.j2
@ -25,7 +25,7 @@

 # BEGIN Autogenerated groups
 {% for group in groups %}
-{% if group not in ['ungrouped', 'all'] %}
+{% if group not in ['ungrouped', 'all'] and not (groups[group]|length == 1 and groups[group][0] == group) %}
 [{{ group }}]
 {% for host in groups[group] %}
 {{ host }}