From 38ce6c3a77a2a02f7bf84711ea860dd826cb90fb Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 20 Oct 2023 10:59:02 -0700 Subject: [PATCH] (role/ipareplica) fix auto-fqdn /etc/hosts conflict with tailscale IP --- hieradata/role/ipareplica.yaml | 1 + spec/hosts/roles/ipareplica_spec.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hieradata/role/ipareplica.yaml b/hieradata/role/ipareplica.yaml index 16ce0151e1..7f53985f2a 100644 --- a/hieradata/role/ipareplica.yaml +++ b/hieradata/role/ipareplica.yaml @@ -46,6 +46,7 @@ tailscale::up_options: accept-dns: false # leave /etc/resolv.conf alone hostname: "%{facts.fqdn}" # use fqdn instead of short hostname +hosts::manage_fqdn: false # avoid conflict with tailscale address hosts::entries: ipa1.dev.lsst.org: ip: "100.76.95.74" diff --git a/spec/hosts/roles/ipareplica_spec.rb b/spec/hosts/roles/ipareplica_spec.rb index 9c6ccb08a6..42bfdc3dd9 100644 --- a/spec/hosts/roles/ipareplica_spec.rb +++ b/spec/hosts/roles/ipareplica_spec.rb @@ -33,6 +33,8 @@ ) end + it { is_expected.to contain_class('hosts').with_manage_fqdn(false) } + { 'ipa1.dev.lsst.org': '100.76.95.74', 'ipa2.dev.lsst.org': '100.77.145.58',