openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Use openstack commands when setting dns_servers"

Browse Source
This commit is contained in:
Zuul 2021-07-07 20:19:21 +00:00 committed by Gerrit Code Review
commit 96dc904147
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/overcloud-prep-network/templates/overcloud-prep-network.sh.j2
View File

@ -109,12 +109,12 @@ sudo ifup ifcfg-{{ network.device_name }}
## * Set the DNS server in the control plane network ## * Set the DNS server in the control plane network
## :: ## ::
{% if overcloud_dns_servers|default([]) and release not in ['mitaka', 'newton'] %} {% if overcloud_dns_servers|default([]) %}
CTLPLANE_SUBNET=$(openstack subnet show ctlplane-subnet -f value -c id) CTLPLANE_SUBNET=$(openstack subnet show ctlplane-subnet -f value -c id)
neutron subnet-update $CTLPLANE_SUBNET \ openstack subnet set $CTLPLANE_SUBNET --no-dns-nameserver \
{% for nameserver in overcloud_dns_servers %} --dns-nameserver "{{ nameserver }}" {% endfor %} {% for nameserver in overcloud_dns_servers %} --dns-nameserver "{{ nameserver }}" {% endfor %}
{% else %} {% else %}
neutron subnet-update $(neutron net-list | awk '/ctlplane/{print $(NF-2) }') $(awk 'match($0, /nameserver\s+(([0-9]{1,3}.?){4})/,address){printf " --dns-nameserver %s", address[1]}' /etc/resolv.conf) openstack subnet set $(openstack subnet list | awk '/ctlplane/{print $(NF-7) }') $(awk 'match($0, /nameserver\s+(([0-9]{1,3}.?){4})/,address){printf " --dns-nameserver %s", address[1]}' /etc/resolv.conf)
{% endif %} {% endif %}
### --stop_docs ### --stop_docs