opuppet/module-tinc
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

No more dep on bridge_utils, commented out resource export/collect

Browse source
This commit is contained in:
jigen 2015-09-27 20:45:22 +02:00
parent 57b93c0883
commit c280a4e706
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
manifests/instance.pp
View file

@ -113,29 +113,43 @@ define tinc::instance(
mode => '0600'; mode => '0600';
} }
# export this host and collect all the other hosts # export this host and collect all the other hosts
@@tinc::host{"${fqdn_tinc}@${name}": # @@tinc::host{"${fqdn_tinc}@${name}":
# port => $port,
# compression => $compression,
# address => $host_address,
# public_key => $tinc_keys[1],
# tag => "tinc::host_for_${name}",
# }
# Tinc::Host<<| tag == "tinc::host_for_${name}" |>>
tinc::host{"${fqdn_tinc}@${name}":
port => $port, port => $port,
compression => $compression, compression => $compression,
address => $host_address, address => $host_address,
public_key => $tinc_keys[1], public_key => $tinc_keys[1],
tag => "tinc::host_for_${name}", tag => "tinc::host_for_${name}",
} }
Tinc::Host<<| tag == "tinc::host_for_${name}" |>>
concat::fragment{"tinc_conf_header_${name}": concat::fragment{"tinc_conf_header_${name}":
target => $tinc_config, target => $tinc_config,
content => template('tinc/tinc.conf-header.erb'), content => template('tinc/tinc.conf-header.erb'),
order => '100', order => '100',
} }
@@tinc::connect_to{"${name}_connect_to_${fqdn_tinc}": # @@tinc::connect_to{"${name}_connect_to_${fqdn_tinc}":
# to => $fqdn_tinc,
# to_fqdn => $::fqdn,
# target => $tinc_config,
# tag => "tinc_${name}_auto",
# Tinc::Connect_to<<| tag == "tinc_${name}_auto" |>>
tinc::connect_to{"${name}_connect_to_${fqdn_tinc}":
to => $fqdn_tinc, to => $fqdn_tinc,
to_fqdn => $::fqdn, to_fqdn => $::fqdn,
target => $tinc_config, target => $tinc_config,
tag => "tinc_${name}_auto", tag => "tinc_${name}_auto",
} }
Tinc::Connect_to<<| tag == "tinc_${name}_auto" |>>
file { "/etc/tinc/${name}/tinc-up": file { "/etc/tinc/${name}/tinc-up":
content => $tinc_up_content, content => $tinc_up_content,
notify => Service[$service_name], notify => Service[$service_name],

2
manifests/switch.pp
View file

@ -25,7 +25,7 @@ define tinc::switch(
if $ensure == 'present' { if $ensure == 'present' {
include ::tinc include ::tinc
require bridge_utils # require bridge_utils
$real_tinc_bridge_interface = $tinc_bridge_interface ? { $real_tinc_bridge_interface = $tinc_bridge_interface ? {
'absent' => "br${name}", 'absent' => "br${name}",
default => $tinc_bridge_interface default => $tinc_bridge_interface