From d768a01cabfae78b10585a505ae42f70ebda84ff Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Sat, 21 Mar 2015 02:13:07 +0000 Subject: [PATCH] Removes check for a "public" network This is only possible if the OpenStack cloud explicitly has a network called "public". --- .../resource_openstack_compute_instance_v2.go | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go index 42ffb8445d..11e0fd50aa 100644 --- a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go +++ b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go @@ -331,20 +331,6 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err d.Set("access_ip_v6", server.AccessIPv6) hostv4 := server.AccessIPv4 - if hostv4 == "" { - if publicAddressesRaw, ok := server.Addresses["public"]; ok { - publicAddresses := publicAddressesRaw.([]interface{}) - for _, paRaw := range publicAddresses { - pa := paRaw.(map[string]interface{}) - if pa["version"].(float64) == 4 { - hostv4 = pa["addr"].(string) - break - } - } - } - } - - // If no host found, just get the first IPv4 we find if hostv4 == "" { for _, networkAddresses := range server.Addresses { for _, element := range networkAddresses.([]interface{}) { @@ -360,20 +346,6 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err log.Printf("hostv4: %s", hostv4) hostv6 := server.AccessIPv6 - if hostv6 == "" { - if publicAddressesRaw, ok := server.Addresses["public"]; ok { - publicAddresses := publicAddressesRaw.([]interface{}) - for _, paRaw := range publicAddresses { - pa := paRaw.(map[string]interface{}) - if pa["version"].(float64) == 6 { - hostv6 = fmt.Sprintf("[%s]", pa["addr"].(string)) - break - } - } - } - } - - // If no hostv6 found, just get the first IPv6 we find if hostv6 == "" { for _, networkAddresses := range server.Addresses { for _, element := range networkAddresses.([]interface{}) {