openstack/openstack-ansible-openstack_hosts
Code Issues Proposed changes

Merge "Do not add /etc/hosts entry for 127.0.1.1"

Browse Source
This commit is contained in:
Zuul 2019-07-23 09:11:58 +00:00 committed by Gerrit Code Review
commit 67a267c20c
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/openstack-host-hostfile-setup.sh.j2
View File

@ -34,15 +34,6 @@ function host_update {
fi fi
} }
{% raw -%}
{% set host_rfc_1034_1035_name = inventory_hostname|replace('_', '-') %}
host_update "{{ ansible_hostname|default(host_rfc_1034_1035_name) }}" \
"{{ host_rfc_1034_1035_name }}" \
"{{ inventory_hostname }}" \
"127.0.1.1" \
"{{ openstack_domain }}"
{% endraw %}
{% for item in groups['all'] %} {% for item in groups['all'] %}
{% set target_rfc_1034_1035_name = item|replace('_', '-') %} {% set target_rfc_1034_1035_name = item|replace('_', '-') %}
host_update "{{ hostvars[item]['ansible_hostname']|default(target_rfc_1034_1035_name) }}" \ host_update "{{ hostvars[item]['ansible_hostname']|default(target_rfc_1034_1035_name) }}" \

1
tests/test.yml
View File

@ -136,7 +136,6 @@
- "'ebtables' in modules_content" - "'ebtables' in modules_content"
- "'vm.swappiness' in sysctl_content" - "'vm.swappiness' in sysctl_content"
- "'127.0.0.1 {{ ansible_hostname }}.openstack.local localhost {{ ansible_hostname }}' in hosts_content" - "'127.0.0.1 {{ ansible_hostname }}.openstack.local localhost {{ ansible_hostname }}' in hosts_content"
- "'127.0.1.1 {{ ansible_hostname }}.openstack.local localhost {{ ansible_hostname }}' in hosts_content"
- "'127.111.111.101 {{ ansible_hostname }}.openstack.local test1 {{ ansible_hostname }}' in hosts_content" - "'127.111.111.101 {{ ansible_hostname }}.openstack.local test1 {{ ansible_hostname }}' in hosts_content"
- "'127.111.111.102 {{ ansible_hostname }}.openstack.local test2 {{ ansible_hostname }}' in hosts_content" - "'127.111.111.102 {{ ansible_hostname }}.openstack.local test2 {{ ansible_hostname }}' in hosts_content"
- "'127.111.111.103 {{ ansible_hostname }}.openstack.local test3 {{ ansible_hostname }}' in hosts_content" - "'127.111.111.103 {{ ansible_hostname }}.openstack.local test3 {{ ansible_hostname }}' in hosts_content"