Skip to content

Commit 8f944eb

Browse files
committed
add parameter to switch to trusted facts, fixes saz#226
1 parent c576dfd commit 8f944eb

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

manifests/hostkeys.pp

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,23 @@
99
Array $extra_aliases = [],
1010
Array $exclude_interfaces = [],
1111
Array $exclude_ipaddresses = [],
12+
Boolean $use_trusted_facts = false,
1213
) {
1314

15+
if $use_trusted_facts {
16+
$fqdn_real = $trusted['certname']
17+
$hostname_real = $trusted['hostname']
18+
} else {
19+
$fqdn_real = $facts['networking']['fqdn']
20+
$hostname_real = $facts['networking']['hostname']
21+
}
22+
1423
if $export_ipaddresses == true {
1524
$ipaddresses = ssh::ipaddresses($exclude_interfaces)
1625
$ipaddresses_real = $ipaddresses - $exclude_ipaddresses
17-
$host_aliases = sort(unique(flatten([ $::fqdn, $::hostname, $extra_aliases, $ipaddresses_real ])))
26+
$host_aliases = sort(unique(flatten([ $fqdn_real, $hostname_real, $extra_aliases, $ipaddresses_real ])))
1827
} else {
19-
$host_aliases = sort(unique(flatten([ $::fqdn, $::hostname, $extra_aliases])))
28+
$host_aliases = sort(unique(flatten([ $fqdn_real, $hostname_real, $extra_aliases ])))
2029
}
2130

2231
if $storeconfigs_group {
@@ -33,14 +42,14 @@
3342
}
3443

3544
if $key_type in $facts['ssh'] {
36-
@@sshkey { "${::fqdn}_${key_type}":
45+
@@sshkey { "${fqdn_real}_${key_type}":
3746
ensure => present,
3847
host_aliases => $host_aliases,
3948
type => $key_type_real,
4049
key => $facts['ssh'][$key_type]['key'],
4150
}
4251
} else {
43-
@@sshkey { "${::fqdn}_${key_type}":
52+
@@sshkey { "${fqdn_real}_${key_type}":
4453
ensure => absent,
4554
type => $key_type_real,
4655
}

0 commit comments

Comments
 (0)