summaryrefslogtreecommitdiff
path: root/puppet/modules/site_openvpn
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-05-11 14:05:14 -0400
committerMicah Anderson <micah@riseup.net>2013-05-16 12:46:00 -0400
commit0f6d2ebd6467d1c793d1907d677ca374a1efe477 (patch)
tree6eb41289124d65abd2955fde80ba35c403870dd0 /puppet/modules/site_openvpn
parentb3d1c6c58838b0c4f368bc42493ac3bae280b5af (diff)
special casing for pistoncloud/openstack/ec2
Diffstat (limited to 'puppet/modules/site_openvpn')
-rw-r--r--puppet/modules/site_openvpn/manifests/init.pp33
1 files changed, 20 insertions, 13 deletions
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index 9bfffa6f..685871bd 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -22,11 +22,16 @@ class site_openvpn {
$openvpn_config = hiera('openvpn')
$x509_config = hiera('x509')
$openvpn_ports = $openvpn_config['ports']
- $openvpn_gateway_address = $openvpn_config['gateway_address']
- if $openvpn_config['second_gateway_address'] {
- $openvpn_second_gateway_address = $openvpn_config['second_gateway_address']
+
+ if $::ec2_instance_id {
+ $openvpn_gateway_address = $::ipaddress
} else {
- $openvpn_second_gateway_address = undef
+ $openvpn_gateway_address = $openvpn_config['gateway_address']
+ if $openvpn_config['second_gateway_address'] {
+ $openvpn_second_gateway_address = $openvpn_config['second_gateway_address']
+ } else {
+ $openvpn_second_gateway_address = undef
+ }
}
$openvpn_allow_unlimited = $openvpn_config['allow_unlimited']
@@ -38,15 +43,17 @@ class site_openvpn {
$openvpn_unlimited_udp_netmask = '255.255.248.0'
$openvpn_unlimited_udp_cidr = '21'
- $openvpn_allow_limited = $openvpn_config['allow_limited']
- $openvpn_limited_prefix = $openvpn_config['limited_prefix']
- $openvpn_rate_limit = $openvpn_config['rate_limit']
- $openvpn_limited_tcp_network_prefix = '10.43.0'
- $openvpn_limited_tcp_netmask = '255.255.248.0'
- $openvpn_limited_tcp_cidr = '21'
- $openvpn_limited_udp_network_prefix = '10.44.0'
- $openvpn_limited_udp_netmask = '255.255.248.0'
- $openvpn_limited_udp_cidr = '21'
+ if !$::ec2_instance_id {
+ $openvpn_allow_limited = $openvpn_config['allow_limited']
+ $openvpn_limited_prefix = $openvpn_config['limited_prefix']
+ $openvpn_rate_limit = $openvpn_config['rate_limit']
+ $openvpn_limited_tcp_network_prefix = '10.43.0'
+ $openvpn_limited_tcp_netmask = '255.255.248.0'
+ $openvpn_limited_tcp_cidr = '21'
+ $openvpn_limited_udp_network_prefix = '10.44.0'
+ $openvpn_limited_udp_netmask = '255.255.248.0'
+ $openvpn_limited_udp_cidr = '21'
+ }
# deploy ca + server keys
include site_openvpn::keys