Skip to content

Commit dc5aa5e

Browse files
committed
Merge pull request hashicorp#4878 from Fodoj/support-dvr
provider/openstack Add Distributed router support
2 parents 3db8444 + 6301615 commit dc5aa5e

15 files changed

Lines changed: 190 additions & 25 deletions

File tree

Godeps/Godeps.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

builtin/providers/openstack/resource_openstack_networking_router_v2.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ func resourceNetworkingRouterV2() *schema.Resource {
3737
ForceNew: false,
3838
Computed: true,
3939
},
40+
"distributed": &schema.Schema{
41+
Type: schema.TypeBool,
42+
Optional: true,
43+
ForceNew: true,
44+
Computed: true,
45+
},
4046
"external_gateway": &schema.Schema{
4147
Type: schema.TypeString,
4248
Optional: true,
@@ -69,6 +75,11 @@ func resourceNetworkingRouterV2Create(d *schema.ResourceData, meta interface{})
6975
createOpts.AdminStateUp = &asu
7076
}
7177

78+
if dRaw, ok := d.GetOk("distributed"); ok {
79+
d := dRaw.(bool)
80+
createOpts.Distributed = &d
81+
}
82+
7283
externalGateway := d.Get("external_gateway").(string)
7384
if externalGateway != "" {
7485
gatewayInfo := routers.GatewayInfo{
@@ -126,6 +137,7 @@ func resourceNetworkingRouterV2Read(d *schema.ResourceData, meta interface{}) er
126137

127138
d.Set("name", n.Name)
128139
d.Set("admin_state_up", n.AdminStateUp)
140+
d.Set("distributed", n.Distributed)
129141
d.Set("tenant_id", n.TenantID)
130142
d.Set("external_gateway", n.GatewayInfo.NetworkID)
131143

builtin/providers/openstack/resource_openstack_networking_router_v2_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ var testAccNetworkingV2Router_basic = fmt.Sprintf(`
9191
resource "openstack_networking_router_v2" "foo" {
9292
name = "router"
9393
admin_state_up = "true"
94+
distributed = "false"
9495
}`)
9596

9697
var testAccNetworkingV2Router_update = fmt.Sprintf(`
9798
resource "openstack_networking_router_v2" "foo" {
9899
name = "router_2"
99100
admin_state_up = "true"
101+
distributed = "false"
100102
}`)

vendor/github.com/rackspace/gophercloud/openstack/client.go

Lines changed: 39 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume/requests.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/fixtures.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/compute/v2/servers/requests.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/identity/v3/tokens/requests.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/requests.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rackspace/gophercloud/openstack/networking/v2/extensions/layer3/routers/results.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)