openstack/kayobe
Code Issues Proposed changes

Merge "Remove nameservers with any IP in overcloud resolv.conf workaround"

Browse Source
This commit is contained in:
Zuul 2020-04-27 11:02:19 +00:00 committed by Gerrit Code Review
commit 316a42e623
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ansible/group_vars/all/overcloud
View File

@ -22,13 +22,12 @@ disable_cloud_init: False
###############################################################################
# Overcloud host image configuration.
# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
# entries to this file, and will not remove this bogus entry. Typically this
# leads to a delay of around 30 seconds when connecting via SSH, due to a
# timeout in NSS. The workaround employed here is to remove this bogus entry
# from the image using virt-customize, if it exists. See
# https://bugs.centos.org/view.php?id=14369.
# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
# 192.168.122.1. Cloud-init only appends name server entries to this file, and
# will not remove this bogus entry. Typically this leads to a delay of around
# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
# employed here is to remove this bogus entry from the image using
# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
overcloud_host_image_workaround_resolv_enabled: True
# Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set

15
ansible/overcloud-host-image-workaround-resolv.yml
View File

@ -1,11 +1,10 @@
---
# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
# entries to this file, and will not remove this bogus entry. Typically this
# leads to a delay of around 30 seconds when connecting via SSH, due to a
# timeout in NSS. The workaround employed here is to remove this bogus entry
# from the image using virt-customize, if it exists. See
# https://bugs.centos.org/view.php?id=14369.
# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
# 192.168.122.1. Cloud-init only appends name server entries to this file, and
# will not remove this bogus entry. Typically this leads to a delay of around
# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
# employed here is to remove this bogus entry from the image using
# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
- name: Ensure the overcloud host image has bogus name server entries removed
hosts: seed
@ -32,5 +31,5 @@
--connection local
--become
-m command
-a "virt-customize -a /httpboot/deployment_image.qcow2 --edit \"/etc/resolv.conf:s/^nameserver 10\.0\.2\.3\$//\""'
-a "virt-customize -a /httpboot/deployment_image.qcow2 --edit \"/etc/resolv.conf:s/^nameserver .*\..*\..*\..*\$//\""'
when: overcloud_host_image_workaround_resolv_enabled | bool

13
etc/kayobe/overcloud.yml
View File

@ -19,13 +19,12 @@
###############################################################################
# Overcloud host image configuration.
# The CentOS cloud images from 7.2 (1511) onwards have a bogus name server
# entry in /etc/resolv.conf, 10.0.2.3. Cloud-init only appends name server
# entries to this file, and will not remove this bogus entry. Typically this
# leads to a delay of around 30 seconds when connecting via SSH, due to a
# timeout in NSS. The workaround employed here is to remove this bogus entry
# from the image using virt-customize, if it exists. See
# https://bugs.centos.org/view.php?id=14369.
# The CentOS cloud images have a bogus name server entry in /etc/resolv.conf,
# 192.168.122.1. Cloud-init only appends name server entries to this file, and
# will not remove this bogus entry. Typically this leads to a delay of around
# 30 seconds when connecting via SSH, due to a timeout in NSS. The workaround
# employed here is to remove this bogus entry from the image using
# virt-customize, if it exists. See https://bugs.centos.org/view.php?id=14369.
#overcloud_host_image_workaround_resolv_enabled:
# Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set