Merge pull request #961 from lsst-it/IT-4713/ipareplica

(role/ipareplica) fix auto-fqdn /etc/hosts conflict with tailscale IP
lsst-it · Oct 20, 2023 · 5c024fa · 5c024fa
2 parents f5e88cd + 38ce6c3
commit 5c024fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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',
-Original file line number
+Diff line change
@@ Expand Up / @@ -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',
@@ Expand Down @@