From f8f50ec96e4d8995ccf2e7f19eaf7606bcabdcd2 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Sat, 25 Mar 2017 04:47:30 +0000
Subject: [PATCH] provider/openstack: Decprecating Instance Floating IP
 attribute

This commit deprecates the floating_ip attributes from the
openstack_compute_instance_v2 resource. It is recommended to use
either the openstack_compute_floatingip_associate resource or
configure an openstack_networking_port_v2 resource with a floating
IP.
---
 .../resource_openstack_compute_instance_v2.go | 14 +++++++-----
 .../r/compute_instance_v2.html.markdown       | 22 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
index 1fa514c29d29..cd7a7d54ac66 100644
--- a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
+++ b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go
@@ -79,9 +79,10 @@ func resourceComputeInstanceV2() *schema.Resource {
 				DefaultFunc: schema.EnvDefaultFunc("OS_FLAVOR_NAME", nil),
 			},
 			"floating_ip": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: false,
+				Type:       schema.TypeString,
+				Optional:   true,
+				ForceNew:   false,
+				Deprecated: "Use the openstack_compute_floatingip_associate_v2 resource instead",
 			},
 			"user_data": &schema.Schema{
 				Type:     schema.TypeString,
@@ -150,9 +151,10 @@ func resourceComputeInstanceV2() *schema.Resource {
 							Computed: true,
 						},
 						"floating_ip": &schema.Schema{
-							Type:     schema.TypeString,
-							Optional: true,
-							Computed: true,
+							Type:       schema.TypeString,
+							Optional:   true,
+							Computed:   true,
+							Deprecated: "Use the openstack_compute_floatingip_associate_v2 resource instead",
 						},
 						"mac": &schema.Schema{
 							Type:     schema.TypeString,
diff --git a/website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown b/website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown
index 13379023772b..d001ee0939c4 100644
--- a/website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown
+++ b/website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown
@@ -174,7 +174,7 @@ resource "openstack_compute_instance_v2" "instance_1" {
 ### Instance With Multiple Networks
 
 ```
-resource "openstack_compute_floatingip_v2" "myip" {
+resource "openstack_networking_floatingip_v2" "myip" {
   pool = "my_pool"
 }
 
@@ -190,13 +190,15 @@ resource "openstack_compute_instance_v2" "multi-net" {
   }
 
   network {
-    name        = "my_second_network"
-    floating_ip = "${openstack_compute_floatingip_v2.myip.address}"
-
-    # Terraform will use this network for provisioning
-    access_network = true
+    name = "my_second_network"
   }
 }
+
+resource "openstack_compute_floatingip_associate_v2" "myip" {
+  floating_ip = "${openstack_networking_floatingip_v2.myip.address}"
+  instance_id = "${openstack_compute_instance_v2.multi-net.id}"
+  fixed_ip = "${openstack_compute_instance_v2.multi-net.network.1.fixed_ip_v4}"
+}
 ```
 
 ### Instance With Personality
@@ -280,7 +282,7 @@ The following arguments are supported:
 * `flavor_name` - (Optional; Required if `flavor_id` is empty) The name of the
     desired flavor for the server. Changing this resizes the existing server.
 
-* `floating_ip` - (Optional) A *Compute* Floating IP that will be associated
+* `floating_ip` - (Deprecated) A *Compute* Floating IP that will be associated
     with the Instance. The Floating IP must be provisioned already. See *Notes*
     for more information about Floating IPs.
 
@@ -359,7 +361,7 @@ The `network` block supports:
 * `fixed_ip_v6` - (Optional) Specifies a fixed IPv6 address to be used on this
     network. Changing this creates a new server.
 
-* `floating_ip` - (Optional) Specifies a floating IP address to be associated
+* `floating_ip` - (Deprecated) Specifies a floating IP address to be associated
     with this network. Cannot be combined with a top-level floating IP. See
     *Notes* for more information about Floating IPs.
 
@@ -451,6 +453,10 @@ The following attributes are exported:
 
 ### Floating IPs
 
+Specifying Floating IPs within the instance is now deprecated. Please use
+either the `openstack_compute_floatingip_associate_v2` resource or attach
+the floating IP to an `openstack_networking_port_v2` resource.
+
 Floating IPs can be associated in one of two ways:
 
 * You can specify a Floating IP address by using the top-level `floating_ip`