Merge pull request #6919 from jtopjian/openstack-lb-pool-provider

provider/openstack: Add lb_provider argument to lb_pool_v1 resource

builtin/providers/openstack/resource_openstack_lb_pool_v1.go

@@ -51,6 +51,12 @@ func resourceLBPoolV1() *schema.Resource {
 				Required: true,
 				ForceNew: false,
 			},
+			"lb_provider": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 			"tenant_id": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -116,6 +122,7 @@ func resourceLBPoolV1Create(d *schema.ResourceData, meta interface{}) error {
 		SubnetID: d.Get("subnet_id").(string),
 		LBMethod: d.Get("lb_method").(string),
 		TenantID: d.Get("tenant_id").(string),
+		Provider: d.Get("lb_provider").(string),
 	}
 
 	log.Printf("[DEBUG] Create Options: %#v", createOpts)
@@ -182,6 +189,7 @@ func resourceLBPoolV1Read(d *schema.ResourceData, meta interface{}) error {
 	d.Set("protocol", p.Protocol)
 	d.Set("subnet_id", p.SubnetID)
 	d.Set("lb_method", p.LBMethod)
+	d.Set("lb_provider", p.Provider)
 	d.Set("tenant_id", p.TenantID)
 	d.Set("monitor_ids", p.MonitorIDs)
 	d.Set("member_ids", p.MemberIDs)

builtin/providers/openstack/resource_openstack_lb_pool_v1_test.go

@@ -28,6 +28,7 @@ func TestAccLBV1Pool_basic(t *testing.T) {
 				Config: testAccLBV1Pool_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckLBV1PoolExists(t, "openstack_lb_pool_v1.pool_1", &pool),
+					resource.TestCheckResourceAttr("openstack_lb_pool_v1.pool_1", "lb_provider", "haproxy"),
 				),
 			},
 			resource.TestStep{
@@ -144,6 +145,7 @@ var testAccLBV1Pool_basic = fmt.Sprintf(`
     protocol = "HTTP"
     subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
     lb_method = "ROUND_ROBIN"
+    lb_provider = "haproxy"
   }`,
 	OS_REGION_NAME, OS_REGION_NAME, OS_REGION_NAME)