openstack/tripleo-ansible
Code Issues Proposed changes

Merge "Fix network hostnames in tripleo-hosts-entries"

Browse Source
This commit is contained in:
Zuul 2019-11-11 10:48:16 +00:00 committed by Gerrit Code Review
commit 943e499b8c
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 centos8.localdomain centos8
- 192.168.24.1 centos8.ctlplane.localdomain centos8.ctlplane
- 172.17.0.1 centos8.internal_api.localdomain centos8.internal_api
- 172.17.0.1 centos8.internalapi.localdomain centos8.internalapi
- name: slurp /tmp/hosts
slurp:

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

@ -43,8 +43,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'] ~ ' ' ~