Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add custenv.

  • Loading branch information...
commit 18183e9e9b0f1ce46996afd4904e99d28d0b7f1d 1 parent 3aafe92
Rutger Spiertz authored
View
2  kbp_heartbeat/manifests/init.pp
@@ -31,7 +31,7 @@
# Undocumented
# gen_puppet
#
-class kbp_heartbeat($autojoin="none", $warntime=5, $deadtime=15, $initdead=60, $keepalive=2, $crm="respawn", $node_name=$hostname, $node_dev="eth0", $node_ip=$ipaddress_eth0, $heartbeat_tag="${environment}_${dcenv}") {
+class kbp_heartbeat($autojoin="none", $warntime=5, $deadtime=15, $initdead=60, $keepalive=2, $crm="respawn", $node_name=$hostname, $node_dev="eth0", $node_ip=$ipaddress_eth0, $heartbeat_tag="${environment}_${custenv}") {
$real_heartbeat_tag = "heartbeat_${heartbeat_tag}"
include kbp_icinga::heartbeat
View
6 kbp_loadbalancer/manifests/init.pp
@@ -1,6 +1,6 @@
# Author: Kumina bv <support@kumina.nl>
-class kbp_loadbalancer ($failover=true, $haproxy_loglevel='warning', $loadbalancer_tag="${environment}_${dcenv}", $heartbeat_dev='eth0', $heartbeat_ip=$ipaddress_eth0, $haproxy_in_heartbeat=true, $heartbeat_initdead='60') {
+class kbp_loadbalancer ($failover=true, $haproxy_loglevel='warning', $loadbalancer_tag="${environment}_${custenv}", $heartbeat_dev='eth0', $heartbeat_ip=$ipaddress_eth0, $haproxy_in_heartbeat=true, $heartbeat_initdead='60') {
$real_haproxy_in_heartbeat = $failover ? {
false => false,
default => $haproxy_in_heartbeat,
@@ -44,7 +44,7 @@
Kbp_haproxy::Site::Add_server <<| tag == "haproxy_${loadbalancer_tag}" |>>
}
-define kbp_loadbalancer::ip ($exported=true, $ip, $loadbalancer_tag="${environment}_${dcenv}", $port=80, $location=false, $servername=$fqdn, $serverip=$ipaddress, $serverport=80, $cookie=false,
+define kbp_loadbalancer::ip ($exported=true, $ip, $loadbalancer_tag="${environment}_${custenv}", $port=80, $location=false, $servername=$fqdn, $serverip=$ipaddress, $serverport=80, $cookie=false,
$httpcheck_uri=false, $httpcheck_port=$serverport, $balance='roundrobin', $timeout_connect='10s', $timeout_server_client='10s', $timeout_http_request='10s',
$tcp_sslport=false, $monitoring_ha=false, $monitoring_hostname=$name, $monitoring_status='200', $monitoring_url=false, $monitoring_max_check_attempts=false,
$monitoring_response=false, $monitoring_proxy=false, $nic='eth0', $monitoring_address=$ip, $sslport=false, $httpcheck_interval=false, $httpcheck_fall=false,
@@ -70,7 +70,7 @@
default => regsubst($name, '(.*);(.*)', '\2'),
}
$safe_name = regsubst($real_name, '[^a-zA-Z0-9\-_]', '_', 'G')
- $provider = $dcenv ? {
+ $provider = $custenv ? {
'hetzner' => 'ocf:kumina:hetzner-failover-ip',
default => 'ocf:heartbeat:IPaddr2',
}
View
2  kbp_nfs/manifests/client.pp
@@ -20,7 +20,7 @@
false => $name,
default => $serverpath,
}
- $real_tag = "nfs_${environment}_${dcenv}_${nfs_tag}"
+ $real_tag = "nfs_${environment}_${custenv}_${nfs_tag}"
# This will probably end up opening the same ports for the same hosts multiple times on the
# server if you have several mounts, but that's not a problem.
View
2  kbp_nfs/manifests/server.pp
@@ -35,7 +35,7 @@
statdopts => '--state-directory-path /srv/nfs';
}
- $real_tag = "nfs_${environment}_${dcenv}_${nfs_tag}"
+ $real_tag = "nfs_${environment}_${custenv}_${nfs_tag}"
# We always keep the state in /srv/nfs, to make setting up failover NFS easier
# make sure the directory exists.
Please sign in to comment.
Something went wrong with that request. Please try again.