From cc1a9a5b8f447ff0e11731025106b90939bf7b45 Mon Sep 17 00:00:00 2001 From: Gavin Williams Date: Fri, 16 Jun 2017 21:31:31 +0100 Subject: [PATCH] vendor: Update github.com/terraform-providers/terraform-provider-openstack/openstack --- .../openstack/config.go | 49 ++++++++++++------- .../data_source_openstack_images_image_v2.go | 10 ++-- ..._source_openstack_networking_network_v2.go | 15 +++--- .../openstack/provider.go | 12 ++++- ...openstack_blockstorage_volume_attach_v2.go | 14 +++--- ...source_openstack_blockstorage_volume_v1.go | 21 ++++---- ...source_openstack_blockstorage_volume_v2.go | 21 ++++---- ...enstack_compute_floatingip_associate_v2.go | 19 +++---- ...esource_openstack_compute_floatingip_v2.go | 16 +++--- .../resource_openstack_compute_instance_v2.go | 28 ++++++----- .../resource_openstack_compute_keypair_v2.go | 17 ++++--- .../resource_openstack_compute_secgroup_v2.go | 19 +++---- ...source_openstack_compute_servergroup_v2.go | 17 ++++--- ...urce_openstack_compute_volume_attach_v2.go | 16 +++--- .../resource_openstack_dns_recordset_v2.go | 18 +++---- .../resource_openstack_dns_zone_v2.go | 18 +++---- .../resource_openstack_fw_firewall_v1.go | 18 +++---- .../resource_openstack_fw_policy_v1.go | 18 +++---- .../resource_openstack_fw_rule_v1.go | 18 +++---- .../resource_openstack_images_image_v2.go | 24 ++++----- .../resource_openstack_lb_listener_v2.go | 17 ++++--- .../resource_openstack_lb_loadbalancer_v2.go | 17 ++++--- .../resource_openstack_lb_member_v1.go | 18 +++---- .../resource_openstack_lb_member_v2.go | 17 ++++--- .../resource_openstack_lb_monitor_v1.go | 18 +++---- .../resource_openstack_lb_monitor_v2.go | 17 ++++--- .../resource_openstack_lb_pool_v1.go | 18 +++---- .../resource_openstack_lb_pool_v2.go | 17 ++++--- .../openstack/resource_openstack_lb_vip_v1.go | 18 +++---- ...urce_openstack_networking_floatingip_v2.go | 22 ++++----- ...esource_openstack_networking_network_v2.go | 18 +++---- .../resource_openstack_networking_port_v2.go | 18 +++---- ...penstack_networking_router_interface_v2.go | 16 +++--- ...ce_openstack_networking_router_route_v2.go | 16 +++--- ...resource_openstack_networking_router_v2.go | 9 ++-- ...e_openstack_networking_secgroup_rule_v2.go | 16 +++--- ...source_openstack_networking_secgroup_v2.go | 18 +++---- ...resource_openstack_networking_subnet_v2.go | 18 +++---- ...ce_openstack_objectstorage_container_v1.go | 17 ++++--- .../openstack/util.go | 13 ++--- vendor/vendor.json | 6 +-- 41 files changed, 389 insertions(+), 343 deletions(-) diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/config.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/config.go index 8a2ced2ec..8b0e806ef 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/config.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/config.go @@ -4,6 +4,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" + "log" "net/http" "os" @@ -24,6 +25,7 @@ type Config struct { IdentityEndpoint string Insecure bool Password string + Region string Swauth bool TenantID string TenantName string @@ -31,10 +33,10 @@ type Config struct { Username string UserID string - osClient *gophercloud.ProviderClient + OsClient *gophercloud.ProviderClient } -func (c *Config) loadAndValidate() error { +func (c *Config) LoadAndValidate() error { validEndpoint := false validEndpoints := []string{ "internal", "internalURL", @@ -130,49 +132,60 @@ func (c *Config) loadAndValidate() error { } } - c.osClient = client + c.OsClient = client return nil } +func (c *Config) determineRegion(region string) string { + // If a resource-level region was not specified, and a provider-level region was set, + // use the provider-level region. + if region == "" && c.Region != "" { + region = c.Region + } + + log.Printf("[DEBUG] OpenStack Region is: %s", region) + return region +} + func (c *Config) blockStorageV1Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewBlockStorageV1(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewBlockStorageV1(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } func (c *Config) blockStorageV2Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewBlockStorageV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewBlockStorageV2(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } func (c *Config) computeV2Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewComputeV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewComputeV2(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } func (c *Config) dnsV2Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewDNSV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewDNSV2(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } func (c *Config) imageV2Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewImageServiceV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewImageServiceV2(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } func (c *Config) networkingV2Client(region string) (*gophercloud.ServiceClient, error) { - return openstack.NewNetworkV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewNetworkV2(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } @@ -180,14 +193,14 @@ func (c *Config) networkingV2Client(region string) (*gophercloud.ServiceClient, func (c *Config) objectStorageV1Client(region string) (*gophercloud.ServiceClient, error) { // If Swift Authentication is being used, return a swauth client. if c.Swauth { - return swauth.NewObjectStorageV1(c.osClient, swauth.AuthOpts{ + return swauth.NewObjectStorageV1(c.OsClient, swauth.AuthOpts{ User: c.Username, Key: c.Password, }) } - return openstack.NewObjectStorageV1(c.osClient, gophercloud.EndpointOpts{ - Region: region, + return openstack.NewObjectStorageV1(c.OsClient, gophercloud.EndpointOpts{ + Region: c.determineRegion(region), Availability: c.getEndpointType(), }) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_images_image_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_images_image_v2.go index da03b2be7..7e5bf2d1a 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_images_image_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_images_image_v2.go @@ -17,10 +17,10 @@ func dataSourceImagesImageV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": { @@ -143,7 +143,7 @@ func dataSourceImagesImageV2() *schema.Resource { // dataSourceImagesImageV2Read performs the image lookup. func dataSourceImagesImageV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - imageClient, err := config.imageV2Client(GetRegion(d)) + imageClient, err := config.imageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack image client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_networking_network_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_networking_network_v2.go index f7615c41a..06e2db28b 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_networking_network_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/data_source_openstack_networking_network_v2.go @@ -17,6 +17,12 @@ func dataSourceNetworkingNetworkV2() *schema.Resource { Read: dataSourceNetworkingNetworkV2Read, Schema: map[string]*schema.Schema{ + "region": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, "network_id": &schema.Schema{ Type: schema.TypeString, Optional: true, @@ -29,11 +35,6 @@ func dataSourceNetworkingNetworkV2() *schema.Resource { Type: schema.TypeString, Optional: true, }, - "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), - }, "tenant_id": &schema.Schema{ Type: schema.TypeString, Optional: true, @@ -57,7 +58,7 @@ func dataSourceNetworkingNetworkV2() *schema.Resource { func dataSourceNetworkingNetworkV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) listOpts := networks.ListOpts{ ID: d.Get("network_id").(string), @@ -111,7 +112,7 @@ func dataSourceNetworkingNetworkV2Read(d *schema.ResourceData, meta interface{}) d.Set("admin_state_up", strconv.FormatBool(network.AdminStateUp)) d.Set("shared", strconv.FormatBool(network.Shared)) d.Set("tenant_id", network.TenantID) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/provider.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/provider.go index 49a2d45ec..4ec3ee55a 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/provider.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/provider.go @@ -20,6 +20,13 @@ func Provider() terraform.ResourceProvider { Description: descriptions["auth_url"], }, + "region": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Description: descriptions["region"], + DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + }, + "user_name": &schema.Schema{ Type: schema.TypeString, Optional: true, @@ -187,6 +194,8 @@ func init() { descriptions = map[string]string{ "auth_url": "The Identity authentication URL.", + "region": "The OpenStack region to connect to.", + "user_name": "Username to login with.", "user_id": "User ID to login with.", @@ -231,6 +240,7 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) { IdentityEndpoint: d.Get("auth_url").(string), Insecure: d.Get("insecure").(bool), Password: d.Get("password").(string), + Region: d.Get("region").(string), Swauth: d.Get("swauth").(bool), Token: d.Get("token").(string), TenantID: d.Get("tenant_id").(string), @@ -239,7 +249,7 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) { UserID: d.Get("user_id").(string), } - if err := config.loadAndValidate(); err != nil { + if err := config.LoadAndValidate(); err != nil { return nil, err } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_attach_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_attach_v2.go index 4dd28e7bc..cfc8f4f0a 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_attach_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_attach_v2.go @@ -26,10 +26,10 @@ func resourceBlockStorageVolumeAttachV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "volume_id": &schema.Schema{ @@ -136,7 +136,7 @@ func resourceBlockStorageVolumeAttachV2() *schema.Resource { func resourceBlockStorageVolumeAttachV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.blockStorageV2Client(GetRegion(d)) + client, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -276,7 +276,7 @@ func resourceBlockStorageVolumeAttachV2Create(d *schema.ResourceData, meta inter func resourceBlockStorageVolumeAttachV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.blockStorageV2Client(GetRegion(d)) + client, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -307,7 +307,7 @@ func resourceBlockStorageVolumeAttachV2Read(d *schema.ResourceData, meta interfa func resourceBlockStorageVolumeAttachV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - client, err := config.blockStorageV2Client(GetRegion(d)) + client, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v1.go index 8c84a08e8..7529f6341 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v1.go @@ -31,11 +31,12 @@ func resourceBlockStorageVolumeV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "size": &schema.Schema{ Type: schema.TypeInt, Required: true, @@ -111,7 +112,7 @@ func resourceBlockStorageVolumeV1() *schema.Resource { func resourceBlockStorageVolumeV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV1Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -165,7 +166,7 @@ func resourceBlockStorageVolumeV1Create(d *schema.ResourceData, meta interface{} func resourceBlockStorageVolumeV1Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV1Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -185,7 +186,7 @@ func resourceBlockStorageVolumeV1Read(d *schema.ResourceData, meta interface{}) d.Set("source_vol_id", v.SourceVolID) d.Set("volume_type", v.VolumeType) d.Set("metadata", v.Metadata) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) attachments := make([]map[string]interface{}, len(v.Attachments)) for i, attachment := range v.Attachments { @@ -202,7 +203,7 @@ func resourceBlockStorageVolumeV1Read(d *schema.ResourceData, meta interface{}) func resourceBlockStorageVolumeV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV1Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -226,7 +227,7 @@ func resourceBlockStorageVolumeV1Update(d *schema.ResourceData, meta interface{} func resourceBlockStorageVolumeV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV1Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -239,7 +240,7 @@ func resourceBlockStorageVolumeV1Delete(d *schema.ResourceData, meta interface{} // make sure this volume is detached from all instances before deleting if len(v.Attachments) > 0 { log.Printf("[DEBUG] detaching volumes") - if computeClient, err := config.computeV2Client(GetRegion(d)); err != nil { + if computeClient, err := config.computeV2Client(GetRegion(d, config)); err != nil { return err } else { for _, volumeAttachment := range v.Attachments { diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v2.go index 5944cac04..ea035cf6f 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_blockstorage_volume_v2.go @@ -31,11 +31,12 @@ func resourceBlockStorageVolumeV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "size": &schema.Schema{ Type: schema.TypeInt, Required: true, @@ -121,7 +122,7 @@ func resourceBlockStorageVolumeV2() *schema.Resource { func resourceBlockStorageVolumeV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV2Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -176,7 +177,7 @@ func resourceBlockStorageVolumeV2Create(d *schema.ResourceData, meta interface{} func resourceBlockStorageVolumeV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV2Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -196,7 +197,7 @@ func resourceBlockStorageVolumeV2Read(d *schema.ResourceData, meta interface{}) d.Set("source_vol_id", v.SourceVolID) d.Set("volume_type", v.VolumeType) d.Set("metadata", v.Metadata) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) attachments := make([]map[string]interface{}, len(v.Attachments)) for i, attachment := range v.Attachments { @@ -213,7 +214,7 @@ func resourceBlockStorageVolumeV2Read(d *schema.ResourceData, meta interface{}) func resourceBlockStorageVolumeV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV2Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -237,7 +238,7 @@ func resourceBlockStorageVolumeV2Update(d *schema.ResourceData, meta interface{} func resourceBlockStorageVolumeV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - blockStorageClient, err := config.blockStorageV2Client(GetRegion(d)) + blockStorageClient, err := config.blockStorageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } @@ -250,7 +251,7 @@ func resourceBlockStorageVolumeV2Delete(d *schema.ResourceData, meta interface{} // make sure this volume is detached from all instances before deleting if len(v.Attachments) > 0 { log.Printf("[DEBUG] detaching volumes") - if computeClient, err := config.computeV2Client(GetRegion(d)); err != nil { + if computeClient, err := config.computeV2Client(GetRegion(d, config)); err != nil { return err } else { for _, volumeAttachment := range v.Attachments { diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_associate_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_associate_v2.go index 963e191d6..4f0d70345 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_associate_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_associate_v2.go @@ -23,11 +23,12 @@ func resourceComputeFloatingIPAssociateV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "floating_ip": &schema.Schema{ Type: schema.TypeString, Required: true, @@ -49,7 +50,7 @@ func resourceComputeFloatingIPAssociateV2() *schema.Resource { func resourceComputeFloatingIPAssociateV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -83,7 +84,7 @@ func resourceComputeFloatingIPAssociateV2Create(d *schema.ResourceData, meta int func resourceComputeFloatingIPAssociateV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -97,7 +98,7 @@ func resourceComputeFloatingIPAssociateV2Read(d *schema.ResourceData, meta inter // Now check and see whether the floating IP still exists. // First try to do this by querying the Network API. networkEnabled := true - networkClient, err := config.networkingV2Client(GetRegion(d)) + networkClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { networkEnabled = false } @@ -146,14 +147,14 @@ func resourceComputeFloatingIPAssociateV2Read(d *schema.ResourceData, meta inter d.Set("floating_ip", floatingIP) d.Set("instance_id", instanceId) d.Set("fixed_ip", fixedIP) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeFloatingIPAssociateV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_v2.go index 96e723d5c..9f85850bc 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_floatingip_v2.go @@ -20,10 +20,10 @@ func resourceComputeFloatingIPV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "pool": &schema.Schema{ @@ -53,7 +53,7 @@ func resourceComputeFloatingIPV2() *schema.Resource { func resourceComputeFloatingIPV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -74,7 +74,7 @@ func resourceComputeFloatingIPV2Create(d *schema.ResourceData, meta interface{}) func resourceComputeFloatingIPV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -90,14 +90,14 @@ func resourceComputeFloatingIPV2Read(d *schema.ResourceData, meta interface{}) e d.Set("instance_id", fip.InstanceID) d.Set("address", fip.IP) d.Set("fixed_ip", fip.FixedIP) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeFloatingIPV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_instance_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_instance_v2.go index 4484e7c89..81726ed24 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_instance_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_instance_v2.go @@ -42,11 +42,12 @@ func resourceComputeInstanceV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "name": &schema.Schema{ Type: schema.TypeString, Required: true, @@ -348,7 +349,7 @@ func resourceComputeInstanceV2() *schema.Resource { func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -495,7 +496,7 @@ func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) e // if volumes were specified, attach them after the instance has launched. if v, ok := d.GetOk("volume"); ok { vols := v.(*schema.Set).List() - if blockClient, err := config.blockStorageV1Client(GetRegion(d)); err != nil { + if blockClient, err := config.blockStorageV1Client(GetRegion(d, config)); err != nil { return fmt.Errorf("Error creating OpenStack block storage client: %s", err) } else { if err := attachVolumesToInstance(computeClient, blockClient, d.Id(), vols); err != nil { @@ -509,7 +510,7 @@ func resourceComputeInstanceV2Create(d *schema.ResourceData, meta interface{}) e func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -606,12 +607,15 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err // Set the availability zone d.Set("availability_zone", serverWithAZ.AvailabilityZone) + // Set the region + d.Set("region", GetRegion(d, config)) + return nil } func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -771,7 +775,7 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e oldAttachmentSet := oldAttachments.(*schema.Set).List() log.Printf("[DEBUG] Attempting to detach the following volumes: %#v", oldAttachmentSet) - if blockClient, err := config.blockStorageV1Client(GetRegion(d)); err != nil { + if blockClient, err := config.blockStorageV1Client(GetRegion(d, config)); err != nil { return err } else { if err := detachVolumesFromInstance(computeClient, blockClient, d.Id(), oldAttachmentSet); err != nil { @@ -781,7 +785,7 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e // for each new attachment, attach the volume newAttachmentSet := newAttachments.(*schema.Set).List() - if blockClient, err := config.blockStorageV1Client(GetRegion(d)); err != nil { + if blockClient, err := config.blockStorageV1Client(GetRegion(d, config)); err != nil { return err } else { if err := attachVolumesToInstance(computeClient, blockClient, d.Id(), newAttachmentSet); err != nil { @@ -858,7 +862,7 @@ func resourceComputeInstanceV2Update(d *schema.ResourceData, meta interface{}) e func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -869,7 +873,7 @@ func resourceComputeInstanceV2Delete(d *schema.ResourceData, meta interface{}) e volumeList := volumeSet.List() if len(volumeList) > 0 { log.Printf("[DEBUG] Attempting to detach the following volumes: %#v", volumeList) - if blockClient, err := config.blockStorageV1Client(GetRegion(d)); err != nil { + if blockClient, err := config.blockStorageV1Client(GetRegion(d, config)); err != nil { return err } else { if err := detachVolumesFromInstance(computeClient, blockClient, d.Id(), volumeList); err != nil { diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_keypair_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_keypair_v2.go index 7537d3bda..5d2da47b3 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_keypair_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_keypair_v2.go @@ -19,11 +19,12 @@ func resourceComputeKeypairV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "name": &schema.Schema{ Type: schema.TypeString, Required: true, @@ -45,7 +46,7 @@ func resourceComputeKeypairV2() *schema.Resource { func resourceComputeKeypairV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -71,7 +72,7 @@ func resourceComputeKeypairV2Create(d *schema.ResourceData, meta interface{}) er func resourceComputeKeypairV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -83,14 +84,14 @@ func resourceComputeKeypairV2Read(d *schema.ResourceData, meta interface{}) erro d.Set("name", kp.Name) d.Set("public_key", kp.PublicKey) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeKeypairV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_secgroup_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_secgroup_v2.go index 99887a2da..e3cb3f6dc 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_secgroup_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_secgroup_v2.go @@ -30,11 +30,12 @@ func resourceComputeSecGroupV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "name": &schema.Schema{ Type: schema.TypeString, Required: true, @@ -99,7 +100,7 @@ func resourceComputeSecGroupV2() *schema.Resource { func resourceComputeSecGroupV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -137,7 +138,7 @@ func resourceComputeSecGroupV2Create(d *schema.ResourceData, meta interface{}) e func resourceComputeSecGroupV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -157,14 +158,14 @@ func resourceComputeSecGroupV2Read(d *schema.ResourceData, meta interface{}) err log.Printf("[DEBUG] rulesToMap(sg.Rules): %+v", rtm) d.Set("rule", rtm) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeSecGroupV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -219,7 +220,7 @@ func resourceComputeSecGroupV2Update(d *schema.ResourceData, meta interface{}) e func resourceComputeSecGroupV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_servergroup_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_servergroup_v2.go index 70b31eec6..45e8993ac 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_servergroup_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_servergroup_v2.go @@ -20,11 +20,12 @@ func resourceComputeServerGroupV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, + "name": &schema.Schema{ Type: schema.TypeString, ForceNew: true, @@ -52,7 +53,7 @@ func resourceComputeServerGroupV2() *schema.Resource { func resourceComputeServerGroupV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -78,7 +79,7 @@ func resourceComputeServerGroupV2Create(d *schema.ResourceData, meta interface{} func resourceComputeServerGroupV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -107,14 +108,14 @@ func resourceComputeServerGroupV2Read(d *schema.ResourceData, meta interface{}) } d.Set("members", members) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeServerGroupV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_volume_attach_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_volume_attach_v2.go index 4fa6cb812..fa517414b 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_volume_attach_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_compute_volume_attach_v2.go @@ -29,10 +29,10 @@ func resourceComputeVolumeAttachV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "instance_id": &schema.Schema{ @@ -58,7 +58,7 @@ func resourceComputeVolumeAttachV2() *schema.Resource { func resourceComputeVolumeAttachV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -109,7 +109,7 @@ func resourceComputeVolumeAttachV2Create(d *schema.ResourceData, meta interface{ func resourceComputeVolumeAttachV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } @@ -129,14 +129,14 @@ func resourceComputeVolumeAttachV2Read(d *schema.ResourceData, meta interface{}) d.Set("instance_id", attachment.ServerID) d.Set("volume_id", attachment.VolumeID) d.Set("device", attachment.Device) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceComputeVolumeAttachV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - computeClient, err := config.computeV2Client(GetRegion(d)) + computeClient, err := config.computeV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack compute client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_recordset_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_recordset_v2.go index cf911cd4a..1a7173b1d 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_recordset_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_recordset_v2.go @@ -31,10 +31,10 @@ func resourceDNSRecordSetV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, }, "zone_id": &schema.Schema{ Type: schema.TypeString, @@ -80,7 +80,7 @@ func resourceDNSRecordSetV2() *schema.Resource { func resourceDNSRecordSetV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -131,7 +131,7 @@ func resourceDNSRecordSetV2Create(d *schema.ResourceData, meta interface{}) erro func resourceDNSRecordSetV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -154,7 +154,7 @@ func resourceDNSRecordSetV2Read(d *schema.ResourceData, meta interface{}) error d.Set("ttl", n.TTL) d.Set("type", n.Type) d.Set("records", n.Records) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) d.Set("zone_id", zoneID) return nil @@ -162,7 +162,7 @@ func resourceDNSRecordSetV2Read(d *schema.ResourceData, meta interface{}) error func resourceDNSRecordSetV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -215,7 +215,7 @@ func resourceDNSRecordSetV2Update(d *schema.ResourceData, meta interface{}) erro func resourceDNSRecordSetV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_zone_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_zone_v2.go index 2b4b7995b..a3028e194 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_zone_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_dns_zone_v2.go @@ -30,10 +30,10 @@ func resourceDNSZoneV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -85,7 +85,7 @@ func resourceDNSZoneV2() *schema.Resource { func resourceDNSZoneV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -141,7 +141,7 @@ func resourceDNSZoneV2Create(d *schema.ResourceData, meta interface{}) error { func resourceDNSZoneV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -160,14 +160,14 @@ func resourceDNSZoneV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("type", n.Type) d.Set("attributes", n.Attributes) d.Set("masters", n.Masters) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceDNSZoneV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } @@ -215,7 +215,7 @@ func resourceDNSZoneV2Update(d *schema.ResourceData, meta interface{}) error { func resourceDNSZoneV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - dnsClient, err := config.dnsV2Client(GetRegion(d)) + dnsClient, err := config.dnsV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack DNS client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_firewall_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_firewall_v1.go index 66601b998..957b0f752 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_firewall_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_firewall_v1.go @@ -30,10 +30,10 @@ func resourceFWFirewallV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -82,7 +82,7 @@ func resourceFWFirewallV1() *schema.Resource { func resourceFWFirewallV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -157,7 +157,7 @@ func resourceFWFirewallV1Read(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Retrieve information about firewall: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -175,8 +175,8 @@ func resourceFWFirewallV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("policy_id", firewall.PolicyID) d.Set("admin_state_up", firewall.AdminStateUp) d.Set("tenant_id", firewall.TenantID) - d.Set("region", GetRegion(d)) d.Set("associated_routers", firewall.RouterIDs) + d.Set("region", GetRegion(d, config)) return nil } @@ -184,7 +184,7 @@ func resourceFWFirewallV1Read(d *schema.ResourceData, meta interface{}) error { func resourceFWFirewallV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -254,7 +254,7 @@ func resourceFWFirewallV1Delete(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] Destroy firewall: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_policy_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_policy_v1.go index a810e360e..9012854aa 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_policy_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_policy_v1.go @@ -27,10 +27,10 @@ func resourceFWPolicyV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -71,7 +71,7 @@ func resourceFWPolicyV1() *schema.Resource { func resourceFWPolicyV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -122,7 +122,7 @@ func resourceFWPolicyV1Read(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Retrieve information about firewall policy: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -140,14 +140,14 @@ func resourceFWPolicyV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("audited", policy.Audited) d.Set("tenant_id", policy.TenantID) d.Set("rules", policy.Rules) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceFWPolicyV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -189,7 +189,7 @@ func resourceFWPolicyV1Delete(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Destroy firewall policy: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_rule_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_rule_v1.go index afde64f93..c8e86e4ec 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_rule_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_fw_rule_v1.go @@ -22,10 +22,10 @@ func resourceFWRuleV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -86,7 +86,7 @@ func resourceFWRuleV1() *schema.Resource { func resourceFWRuleV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -131,7 +131,7 @@ func resourceFWRuleV1Read(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Retrieve information about firewall rule: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -159,14 +159,14 @@ func resourceFWRuleV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("protocol", rule.Protocol) } - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceFWRuleV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -238,7 +238,7 @@ func resourceFWRuleV1Delete(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Destroy firewall rule: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_images_image_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_images_image_v2.go index 483494334..0b3fc803a 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_images_image_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_images_image_v2.go @@ -34,6 +34,13 @@ func resourceImagesImageV2() *schema.Resource { }, Schema: map[string]*schema.Schema{ + "region": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "checksum": &schema.Schema{ Type: schema.TypeString, Computed: true, @@ -122,13 +129,6 @@ func resourceImagesImageV2() *schema.Resource { Default: false, }, - "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), - }, - "schema": &schema.Schema{ Type: schema.TypeString, Computed: true, @@ -169,7 +169,7 @@ func resourceImagesImageV2() *schema.Resource { func resourceImagesImageV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - imageClient, err := config.imageV2Client(GetRegion(d)) + imageClient, err := config.imageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack image client: %s", err) } @@ -246,7 +246,7 @@ func resourceImagesImageV2Create(d *schema.ResourceData, meta interface{}) error func resourceImagesImageV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - imageClient, err := config.imageV2Client(GetRegion(d)) + imageClient, err := config.imageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack image client: %s", err) } @@ -277,12 +277,14 @@ func resourceImagesImageV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("size_bytes", img.SizeBytes) d.Set("tags", img.Tags) d.Set("visibility", img.Visibility) + d.Set("region", GetRegion(d, config)) + return nil } func resourceImagesImageV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - imageClient, err := config.imageV2Client(GetRegion(d)) + imageClient, err := config.imageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack image client: %s", err) } @@ -320,7 +322,7 @@ func resourceImagesImageV2Update(d *schema.ResourceData, meta interface{}) error func resourceImagesImageV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - imageClient, err := config.imageV2Client(GetRegion(d)) + imageClient, err := config.imageV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack image client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_listener_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_listener_v2.go index c426f2be6..6951de1fc 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_listener_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_listener_v2.go @@ -21,10 +21,10 @@ func resourceListenerV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "protocol": &schema.Schema{ @@ -111,7 +111,7 @@ func resourceListenerV2() *schema.Resource { func resourceListenerV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -168,7 +168,7 @@ func resourceListenerV2Create(d *schema.ResourceData, meta interface{}) error { func resourceListenerV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -191,13 +191,14 @@ func resourceListenerV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("connection_limit", listener.ConnLimit) d.Set("sni_container_refs", listener.SniContainerRefs) d.Set("default_tls_container_ref", listener.DefaultTlsContainerRef) + d.Set("region", GetRegion(d, config)) return nil } func resourceListenerV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -243,7 +244,7 @@ func resourceListenerV2Update(d *schema.ResourceData, meta interface{}) error { func resourceListenerV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_loadbalancer_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_loadbalancer_v2.go index c4e17995f..d2cc9ed8d 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_loadbalancer_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_loadbalancer_v2.go @@ -27,10 +27,10 @@ func resourceLoadBalancerV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ @@ -108,7 +108,7 @@ func resourceLoadBalancerV2() *schema.Resource { func resourceLoadBalancerV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -167,7 +167,7 @@ func resourceLoadBalancerV2Create(d *schema.ResourceData, meta interface{}) erro func resourceLoadBalancerV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -188,6 +188,7 @@ func resourceLoadBalancerV2Read(d *schema.ResourceData, meta interface{}) error d.Set("admin_state_up", lb.AdminStateUp) d.Set("flavor", lb.Flavor) d.Set("loadbalancer_provider", lb.Provider) + d.Set("region", GetRegion(d, config)) // Get any security groups on the VIP Port if lb.VipPortID != "" { @@ -204,7 +205,7 @@ func resourceLoadBalancerV2Read(d *schema.ResourceData, meta interface{}) error func resourceLoadBalancerV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -241,7 +242,7 @@ func resourceLoadBalancerV2Update(d *schema.ResourceData, meta interface{}) erro func resourceLoadBalancerV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v1.go index e6dc3da9f..5b203371f 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v1.go @@ -29,10 +29,10 @@ func resourceLBMemberV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "tenant_id": &schema.Schema{ Type: schema.TypeString, @@ -71,7 +71,7 @@ func resourceLBMemberV1() *schema.Resource { func resourceLBMemberV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -125,7 +125,7 @@ func resourceLBMemberV1Create(d *schema.ResourceData, meta interface{}) error { func resourceLBMemberV1Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -142,14 +142,14 @@ func resourceLBMemberV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("port", m.ProtocolPort) d.Set("weight", m.Weight) d.Set("admin_state_up", m.AdminStateUp) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceLBMemberV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -172,7 +172,7 @@ func resourceLBMemberV1Update(d *schema.ResourceData, meta interface{}) error { func resourceLBMemberV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v2.go index 61326bac3..62d3dd9dc 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_member_v2.go @@ -26,10 +26,10 @@ func resourceMemberV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ @@ -99,7 +99,7 @@ func resourceMemberV2() *schema.Resource { func resourceMemberV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -174,7 +174,7 @@ func resourceMemberV2Create(d *schema.ResourceData, meta interface{}) error { func resourceMemberV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -194,13 +194,14 @@ func resourceMemberV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("address", member.Address) d.Set("protocol_port", member.ProtocolPort) d.Set("id", member.ID) + d.Set("region", GetRegion(d, config)) return nil } func resourceMemberV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -229,7 +230,7 @@ func resourceMemberV2Update(d *schema.ResourceData, meta interface{}) error { func resourceMemberV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v1.go index 26066cbea..db6c5b261 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v1.go @@ -30,10 +30,10 @@ func resourceLBMonitorV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "tenant_id": &schema.Schema{ Type: schema.TypeString, @@ -88,7 +88,7 @@ func resourceLBMonitorV1() *schema.Resource { func resourceLBMonitorV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -147,7 +147,7 @@ func resourceLBMonitorV1Create(d *schema.ResourceData, meta interface{}) error { func resourceLBMonitorV1Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -168,14 +168,14 @@ func resourceLBMonitorV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("http_method", m.HTTPMethod) d.Set("expected_codes", m.ExpectedCodes) d.Set("admin_state_up", strconv.FormatBool(m.AdminStateUp)) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceLBMonitorV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -212,7 +212,7 @@ func resourceLBMonitorV1Update(d *schema.ResourceData, meta interface{}) error { func resourceLBMonitorV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v2.go index 061c270e5..fb27e256a 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_monitor_v2.go @@ -26,10 +26,10 @@ func resourceMonitorV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "pool_id": &schema.Schema{ @@ -99,7 +99,7 @@ func resourceMonitorV2() *schema.Resource { func resourceMonitorV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -149,7 +149,7 @@ func resourceMonitorV2Create(d *schema.ResourceData, meta interface{}) error { func resourceMonitorV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -172,13 +172,14 @@ func resourceMonitorV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("expected_codes", monitor.ExpectedCodes) d.Set("admin_state_up", monitor.AdminStateUp) d.Set("name", monitor.Name) + d.Set("region", GetRegion(d, config)) return nil } func resourceMonitorV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -222,7 +223,7 @@ func resourceMonitorV2Update(d *schema.ResourceData, meta interface{}) error { func resourceMonitorV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v1.go index 7cf796c6f..e6a13c244 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v1.go @@ -33,10 +33,10 @@ func resourceLBPoolV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -120,7 +120,7 @@ func resourceLBPoolV1() *schema.Resource { func resourceLBPoolV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -190,7 +190,7 @@ func resourceLBPoolV1Create(d *schema.ResourceData, meta interface{}) error { func resourceLBPoolV1Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -210,14 +210,14 @@ func resourceLBPoolV1Read(d *schema.ResourceData, meta interface{}) error { d.Set("tenant_id", p.TenantID) d.Set("monitor_ids", p.MonitorIDs) d.Set("member_ids", p.MemberIDs) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceLBPoolV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -314,7 +314,7 @@ func resourceLBPoolV1Update(d *schema.ResourceData, meta interface{}) error { func resourceLBPoolV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v2.go index d1a602f53..1eb9dfd51 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_pool_v2.go @@ -26,10 +26,10 @@ func resourcePoolV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "tenant_id": &schema.Schema{ @@ -136,7 +136,7 @@ func resourcePoolV2() *schema.Resource { func resourcePoolV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -219,7 +219,7 @@ func resourcePoolV2Create(d *schema.ResourceData, meta interface{}) error { func resourcePoolV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -239,13 +239,14 @@ func resourcePoolV2Read(d *schema.ResourceData, meta interface{}) error { d.Set("name", pool.Name) d.Set("id", pool.ID) d.Set("persistence", pool.Persistence) + d.Set("region", GetRegion(d, config)) return nil } func resourcePoolV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -277,7 +278,7 @@ func resourcePoolV2Update(d *schema.ResourceData, meta interface{}) error { func resourcePoolV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_vip_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_vip_v1.go index 6e6d46d89..39acb5f48 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_vip_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_lb_vip_v1.go @@ -29,10 +29,10 @@ func resourceLBVipV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -110,7 +110,7 @@ func resourceLBVipV1() *schema.Resource { func resourceLBVipV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -166,7 +166,7 @@ func resourceLBVipV1Create(d *schema.ResourceData, meta interface{}) error { func resourceLBVipV1Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -200,14 +200,14 @@ func resourceLBVipV1Read(d *schema.ResourceData, meta interface{}) error { } d.Set("persistence", persistence) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceLBVipV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -287,7 +287,7 @@ func resourceLBVipV1Update(d *schema.ResourceData, meta interface{}) error { func resourceLBVipV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_floatingip_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_floatingip_v2.go index 9712dd156..8f2291021 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_floatingip_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_floatingip_v2.go @@ -31,10 +31,10 @@ func resourceNetworkingFloatingIPV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "address": &schema.Schema{ Type: schema.TypeString, @@ -73,7 +73,7 @@ func resourceNetworkingFloatingIPV2() *schema.Resource { func resourceNetworkFloatingIPV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack network client: %s", err) } @@ -120,7 +120,7 @@ func resourceNetworkFloatingIPV2Create(d *schema.ResourceData, meta interface{}) func resourceNetworkFloatingIPV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack network client: %s", err) } @@ -140,14 +140,14 @@ func resourceNetworkFloatingIPV2Read(d *schema.ResourceData, meta interface{}) e d.Set("pool", poolName) d.Set("tenant_id", floatingIP.TenantID) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceNetworkFloatingIPV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack network client: %s", err) } @@ -171,7 +171,7 @@ func resourceNetworkFloatingIPV2Update(d *schema.ResourceData, meta interface{}) func resourceNetworkFloatingIPV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack network client: %s", err) } @@ -196,7 +196,7 @@ func resourceNetworkFloatingIPV2Delete(d *schema.ResourceData, meta interface{}) func getNetworkID(d *schema.ResourceData, meta interface{}, networkName string) (string, error) { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return "", fmt.Errorf("Error creating OpenStack network client: %s", err) } @@ -226,7 +226,7 @@ func getNetworkID(d *schema.ResourceData, meta interface{}, networkName string) func getNetworkName(d *schema.ResourceData, meta interface{}, networkID string) (string, error) { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return "", fmt.Errorf("Error creating OpenStack network client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_network_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_network_v2.go index 81e8b6379..1d24f1cc5 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_network_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_network_v2.go @@ -31,10 +31,10 @@ func resourceNetworkingNetworkV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -94,7 +94,7 @@ func resourceNetworkingNetworkV2() *schema.Resource { func resourceNetworkingNetworkV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -166,7 +166,7 @@ func resourceNetworkingNetworkV2Create(d *schema.ResourceData, meta interface{}) func resourceNetworkingNetworkV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -182,14 +182,14 @@ func resourceNetworkingNetworkV2Read(d *schema.ResourceData, meta interface{}) e d.Set("admin_state_up", strconv.FormatBool(n.AdminStateUp)) d.Set("shared", strconv.FormatBool(n.Shared)) d.Set("tenant_id", n.TenantID) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceNetworkingNetworkV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -231,7 +231,7 @@ func resourceNetworkingNetworkV2Update(d *schema.ResourceData, meta interface{}) func resourceNetworkingNetworkV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_port_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_port_v2.go index 4be432935..6e7ddc53b 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_port_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_port_v2.go @@ -31,10 +31,10 @@ func resourceNetworkingPortV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -137,7 +137,7 @@ func resourceNetworkingPortV2() *schema.Resource { func resourceNetworkingPortV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -184,7 +184,7 @@ func resourceNetworkingPortV2Create(d *schema.ResourceData, meta interface{}) er func resourceNetworkingPortV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -224,14 +224,14 @@ func resourceNetworkingPortV2Read(d *schema.ResourceData, meta interface{}) erro } d.Set("allowed_address_pairs", pairs) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceNetworkingPortV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -277,7 +277,7 @@ func resourceNetworkingPortV2Update(d *schema.ResourceData, meta interface{}) er func resourceNetworkingPortV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_interface_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_interface_v2.go index 4a4ae8685..2b1cfe84c 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_interface_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_interface_v2.go @@ -26,10 +26,10 @@ func resourceNetworkingRouterInterfaceV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "router_id": &schema.Schema{ Type: schema.TypeString, @@ -52,7 +52,7 @@ func resourceNetworkingRouterInterfaceV2() *schema.Resource { func resourceNetworkingRouterInterfaceV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -89,7 +89,7 @@ func resourceNetworkingRouterInterfaceV2Create(d *schema.ResourceData, meta inte func resourceNetworkingRouterInterfaceV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -106,12 +106,14 @@ func resourceNetworkingRouterInterfaceV2Read(d *schema.ResourceData, meta interf log.Printf("[DEBUG] Retrieved Router Interface %s: %+v", d.Id(), n) + d.Set("region", GetRegion(d, config)) + return nil } func resourceNetworkingRouterInterfaceV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_route_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_route_v2.go index 332017ac6..291e8e13f 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_route_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_route_v2.go @@ -18,10 +18,10 @@ func resourceNetworkingRouterRouteV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "router_id": &schema.Schema{ Type: schema.TypeString, @@ -52,7 +52,7 @@ func resourceNetworkingRouterRouteV2Create(d *schema.ResourceData, meta interfac var nextHop string = d.Get("next_hop").(string) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -110,7 +110,7 @@ func resourceNetworkingRouterRouteV2Read(d *schema.ResourceData, meta interface{ routerId := d.Get("router_id").(string) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -142,6 +142,8 @@ func resourceNetworkingRouterRouteV2Read(d *schema.ResourceData, meta interface{ } } + d.Set("region", GetRegion(d, config)) + return nil } @@ -153,7 +155,7 @@ func resourceNetworkingRouterRouteV2Delete(d *schema.ResourceData, meta interfac config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_v2.go index d979a53e6..bda3f2a4f 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_router_v2.go @@ -70,7 +70,7 @@ func resourceNetworkingRouterV2() *schema.Resource { func resourceNetworkingRouterV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -127,7 +127,7 @@ func resourceNetworkingRouterV2Create(d *schema.ResourceData, meta interface{}) func resourceNetworkingRouterV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -149,6 +149,7 @@ func resourceNetworkingRouterV2Read(d *schema.ResourceData, meta interface{}) er d.Set("distributed", n.Distributed) d.Set("tenant_id", n.TenantID) d.Set("external_gateway", n.GatewayInfo.NetworkID) + d.Set("region", GetRegion(d, config)) return nil } @@ -159,7 +160,7 @@ func resourceNetworkingRouterV2Update(d *schema.ResourceData, meta interface{}) defer osMutexKV.Unlock(routerId) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -194,7 +195,7 @@ func resourceNetworkingRouterV2Update(d *schema.ResourceData, meta interface{}) func resourceNetworkingRouterV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_rule_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_rule_v2.go index 6f5464fed..33e68eb2e 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_rule_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_rule_v2.go @@ -29,10 +29,10 @@ func resourceNetworkingSecGroupRuleV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "direction": &schema.Schema{ Type: schema.TypeString, @@ -95,7 +95,7 @@ func resourceNetworkingSecGroupRuleV2() *schema.Resource { func resourceNetworkingSecGroupRuleV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -152,7 +152,7 @@ func resourceNetworkingSecGroupRuleV2Read(d *schema.ResourceData, meta interface log.Printf("[DEBUG] Retrieve information about security group rule: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -172,7 +172,7 @@ func resourceNetworkingSecGroupRuleV2Read(d *schema.ResourceData, meta interface d.Set("remote_ip_prefix", security_group_rule.RemoteIPPrefix) d.Set("security_group_id", security_group_rule.SecGroupID) d.Set("tenant_id", security_group_rule.TenantID) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } @@ -181,7 +181,7 @@ func resourceNetworkingSecGroupRuleV2Delete(d *schema.ResourceData, meta interfa log.Printf("[DEBUG] Destroy security group rule: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_v2.go index effe0e746..2687627f1 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_secgroup_v2.go @@ -29,10 +29,10 @@ func resourceNetworkingSecGroupV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -61,7 +61,7 @@ func resourceNetworkingSecGroupV2() *schema.Resource { func resourceNetworkingSecGroupV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -101,7 +101,7 @@ func resourceNetworkingSecGroupV2Read(d *schema.ResourceData, meta interface{}) log.Printf("[DEBUG] Retrieve information about security group: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -115,14 +115,14 @@ func resourceNetworkingSecGroupV2Read(d *schema.ResourceData, meta interface{}) d.Set("description", security_group.Description) d.Set("tenant_id", security_group.TenantID) d.Set("name", security_group.Name) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceNetworkingSecGroupV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -155,7 +155,7 @@ func resourceNetworkingSecGroupV2Delete(d *schema.ResourceData, meta interface{} log.Printf("[DEBUG] Destroy security group: %s", d.Id()) config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_subnet_v2.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_subnet_v2.go index be19338aa..266d2de2e 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_subnet_v2.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_networking_subnet_v2.go @@ -29,10 +29,10 @@ func resourceNetworkingSubnetV2() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "network_id": &schema.Schema{ Type: schema.TypeString, @@ -130,7 +130,7 @@ func resourceNetworkingSubnetV2() *schema.Resource { func resourceNetworkingSubnetV2Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -197,7 +197,7 @@ func resourceNetworkingSubnetV2Create(d *schema.ResourceData, meta interface{}) func resourceNetworkingSubnetV2Read(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -231,14 +231,14 @@ func resourceNetworkingSubnetV2Read(d *schema.ResourceData, meta interface{}) er } d.Set("allocation_pools", allocationPools) - d.Set("region", GetRegion(d)) + d.Set("region", GetRegion(d, config)) return nil } func resourceNetworkingSubnetV2Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } @@ -308,7 +308,7 @@ func resourceNetworkingSubnetV2Update(d *schema.ResourceData, meta interface{}) func resourceNetworkingSubnetV2Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - networkingClient, err := config.networkingV2Client(GetRegion(d)) + networkingClient, err := config.networkingV2Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack networking client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_objectstorage_container_v1.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_objectstorage_container_v1.go index 27fb7ae0c..e4cbe5be8 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_objectstorage_container_v1.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/resource_openstack_objectstorage_container_v1.go @@ -17,10 +17,10 @@ func resourceObjectStorageContainerV1() *schema.Resource { Schema: map[string]*schema.Schema{ "region": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -63,7 +63,7 @@ func resourceObjectStorageContainerV1() *schema.Resource { func resourceObjectStorageContainerV1Create(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - objectStorageClient, err := config.objectStorageV1Client(GetRegion(d)) + objectStorageClient, err := config.objectStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack object storage client: %s", err) } @@ -93,12 +93,15 @@ func resourceObjectStorageContainerV1Create(d *schema.ResourceData, meta interfa } func resourceObjectStorageContainerV1Read(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + d.Set("region", GetRegion(d, config)) + return nil } func resourceObjectStorageContainerV1Update(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - objectStorageClient, err := config.objectStorageV1Client(GetRegion(d)) + objectStorageClient, err := config.objectStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack object storage client: %s", err) } @@ -125,7 +128,7 @@ func resourceObjectStorageContainerV1Update(d *schema.ResourceData, meta interfa func resourceObjectStorageContainerV1Delete(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - objectStorageClient, err := config.objectStorageV1Client(GetRegion(d)) + objectStorageClient, err := config.objectStorageV1Client(GetRegion(d, config)) if err != nil { return fmt.Errorf("Error creating OpenStack object storage client: %s", err) } diff --git a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/util.go b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/util.go index 0c879c9ea..397f03378 100644 --- a/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/util.go +++ b/vendor/github.com/terraform-providers/terraform-provider-openstack/openstack/util.go @@ -3,7 +3,6 @@ package openstack import ( "fmt" "net/http" - "os" "sort" "strings" @@ -36,17 +35,15 @@ func CheckDeleted(d *schema.ResourceData, err error, msg string) error { return fmt.Errorf("%s: %s", msg, err) } -// GetRegion returns the region from either d.Get("region") or OS_REGION_NAME -func GetRegion(d *schema.ResourceData) string { +// GetRegion returns the region that was specified in the resource. If a +// region was not set, the provider-level region is checked. The provider-level +// region can either be set by the region argument or by OS_REGION_NAME. +func GetRegion(d *schema.ResourceData, config *Config) string { if v, ok := d.GetOk("region"); ok { return v.(string) } - if v := os.Getenv("OS_REGION_NAME"); v != "" { - return v - } - - return "" + return config.Region } // AddValueSpecs expands the 'value_specs' object and removes 'value_specs' diff --git a/vendor/vendor.json b/vendor/vendor.json index e3520aa0b..1998e322e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1685,10 +1685,10 @@ "revisionTime": "2017-06-12T09:08:25Z" }, { - "checksumSHA1": "+LOuwysQ27JLjJNWSPKF/yXTMEc=", + "checksumSHA1": "7WDq0VsOJmABPUCEvfuerEp7mBg=", "path": "github.com/terraform-providers/terraform-provider-openstack/openstack", - "revision": "6278902610d3077274146559ef10fbb5455e5129", - "revisionTime": "2017-06-09T18:33:54Z" + "revision": "4080a521c6ea4872f38bae658ac17b774eefcfe1", + "revisionTime": "2017-06-13T14:56:00Z" }, { "checksumSHA1": "iHiMTBffQvWYlOLu3130JXuQpgQ=",