From 0e6c5cad63c038c0719ac409bb3cf02b8019f7ad Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 1 Apr 2014 16:40:23 -0400
Subject: Fix for Openstack/Amazon special case needing to allow
 ec2_public_ipv4 in mynetworks (#5427)

Change-Id: Iee954f8cacd852f8c7c598c68a8793a3523c0132
---
 provider_base/services/mx.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'provider_base')

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`'",
-- 
cgit v1.2.3