From 30b0fc7489cd268afae1a328fb05726b8f8fa1d7 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Wed, 25 Mar 2015 16:47:19 +0000
Subject: [PATCH] Only attempt to get the MAC address if it exists.

---
 .../openstack/resource_openstack_compute_instance_v2.go       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
index b4ac115df7..84c31ad8d6 100644
--- a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
+++ b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
@@ -818,7 +818,9 @@ func resourceInstanceAddresses(addresses map[string]interface{}) map[string]map[
 					addrs[n]["fixed_ip_v6"] = fmt.Sprintf("[%s]", address["addr"].(string))
 				}
 			}
-			addrs[n]["mac"] = address["OS-EXT-IPS-MAC:mac_addr"].(string)
+			if mac, ok := address["OS-EXT-IPS-MAC:mac_addr"]; ok {
+				addrs[n]["mac"] = mac.(string)
+			}
 		}
 	}