Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provider/openstack: Decprecating Instance Floating IP attribute #13063

Merged
merged 1 commit into from
Mar 25, 2017
Merged

provider/openstack: Decprecating Instance Floating IP attribute #13063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions builtin/providers/openstack/resource_openstack_compute_instance_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
22 changes: 14 additions & 8 deletions website/source/docs/providers/openstack/r/compute_instance_v2.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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`
Expand Down