summaryrefslogtreecommitdiff
path: root/provider_base/services/mx.json
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-04-01 16:40:23 -0400
committerMicah Anderson <micah@leap.se>2014-04-01 16:40:23 -0400
commit0e6c5cad63c038c0719ac409bb3cf02b8019f7ad (patch)
treea62fcc90f998affa6c12ab6b7a919c5f45867fe1 /provider_base/services/mx.json
parent1906f13a7df02522bcd83a3c25101555870b5279 (diff)
Fix for Openstack/Amazon special case needing to allow ec2_public_ipv4
in mynetworks (#5427) Change-Id: Iee954f8cacd852f8c7c598c68a8793a3523c0132
Diffstat (limited to 'provider_base/services/mx.json')
-rw-r--r--provider_base/services/mx.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json
index 0d1ec877..731dee9a 100644
--- a/provider_base/services/mx.json
+++ b/provider_base/services/mx.json
@@ -10,7 +10,7 @@
"password": "= secret :couch_leap_mx_password",
"salt": "= hex_secret :couch_leap_mx_password_salt, 128"
},
- "mynetworks": "= nodes['environment' => '!local'].field('ip_address')",
+ "mynetworks": "= nodes['environment' => '!local'].map{|name, n| [n.ip_address, (global.facts[name]||{})['ec2_public_ipv4']]}.flatten.compact.uniq",
"x509": {
"use": true,
"ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",