openstack
/
tripleo-ansible
Code Issues Proposed changes

Fix network hostnames in tripleo-hosts-entries 

The previous Heat behavior used the jinja2 lower() filter on the network
name to create the hostnames, not network.name_lower. As
network.name_lower can container underscores, this was causing an issue
since the expected hostnames were not present in /etc/hosts.

This patch corrects the issue by switching to just using the lower()
filter.

Conflicts:
    tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml
    tripleo_ansible/roles/tripleo-hosts-entries/tasks/main.yml

Change-Id: Ia02ca1263590e2b579f2534e99119d7b1cd4b39a
(cherry picked from commit 3f27375920)
This commit is contained in:
James Slagle 2019-11-05 09:08:51 -05:00 committed by Luke Short
parent 38a2e762a5
commit 4870a83b73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/verify.yml
View File

@ -28,10 +28,10 @@
loop:
- 192.168.24.2 centos7.localdomain centos7
- 192.168.24.2 centos7.ctlplane.localdomain centos7.ctlplane
- 172.17.0.2 centos7.internal_api.localdomain centos7.internal_api
- 172.17.0.2 centos7.internalapi.localdomain centos7.internalapi
- 192.168.24.1 fedora28.localdomain fedora28
- 192.168.24.1 fedora28.ctlplane.localdomain fedora28.ctlplane
- 172.17.0.1 fedora28.internal_api.localdomain fedora28.internal_api
- 172.17.0.1 fedora28.internalapi.localdomain fedora28.internalapi
- name: slurp /tmp/hosts
slurp:

4
tripleo_ansible/roles/tripleo-hosts-entries/tasks/main.yml
View File

@ -30,8 +30,8 @@
{% if role_networks is not none %}
{% for network in role_networks | default([]) %}
{{ hostvars[host][networks[network]['name_lower'] ~ '_ip'] ~ ' ' ~
host ~ '.' ~ networks[network]['name_lower'] ~ '.' ~ cloud_domain ~ ' ' ~
host ~ '.' ~ networks[network]['name_lower'] }}
host ~ '.' ~ network.lower() ~ '.' ~ cloud_domain ~ ' ' ~
host ~ '.' ~ network.lower() }}
{% endfor %}
{% endif %}
{{ hostvars[host]['ctlplane_ip'] ~ ' ' ~