From 52f130cb64c29d1ee740285a8307a0473dab7144 Mon Sep 17 00:00:00 2001 From: Kirill Shirinkin Date: Fri, 2 Sep 2016 07:51:44 -0500 Subject: [PATCH] provider/openstack: Fix documentaion for whole LBaaS v2 group --- .../docs/providers/openstack/r/lb_listener_v2.html.markdown | 4 ++-- .../providers/openstack/r/lb_loadbalancer_v2.html.markdown | 2 +- .../docs/providers/openstack/r/lb_member_v2.html.markdown | 6 ++++-- .../docs/providers/openstack/r/lb_monitor_v2.html.markdown | 4 ++-- .../docs/providers/openstack/r/lb_pool_v2.html.markdown | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/website/source/docs/providers/openstack/r/lb_listener_v2.html.markdown b/website/source/docs/providers/openstack/r/lb_listener_v2.html.markdown index ac042223e..996633c01 100644 --- a/website/source/docs/providers/openstack/r/lb_listener_v2.html.markdown +++ b/website/source/docs/providers/openstack/r/lb_listener_v2.html.markdown @@ -1,6 +1,6 @@ --- layout: "openstack" -page_title: "OpenStack: openstack_lbaas_listener_v2" +page_title: "OpenStack: openstack_lb_listener_v2" sidebar_current: "docs-openstack-resource-lbaas-listener-v2" description: |- Manages a V2 listener resource within OpenStack. @@ -13,7 +13,7 @@ Manages a V2 listener resource within OpenStack. ## Example Usage ``` -resource "openstack_lbaas_listener_v2" "listener_1" { +resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 loadbalancer_id = "d9415786-5f1a-428b-b35f-2f1523e146d2" diff --git a/website/source/docs/providers/openstack/r/lb_loadbalancer_v2.html.markdown b/website/source/docs/providers/openstack/r/lb_loadbalancer_v2.html.markdown index 4e04dda9f..8e3bfcb8f 100644 --- a/website/source/docs/providers/openstack/r/lb_loadbalancer_v2.html.markdown +++ b/website/source/docs/providers/openstack/r/lb_loadbalancer_v2.html.markdown @@ -13,7 +13,7 @@ Manages a V2 loadbalancer resource within OpenStack. ## Example Usage ``` -resource "openstack_lbaas_loadbalancer_v2" "lb_1" { +resource "openstack_lb_loadbalancer_v2" "lb_1" { vip_subnet_id = "d9415786-5f1a-428b-b35f-2f1523e146d2" } ``` diff --git a/website/source/docs/providers/openstack/r/lb_member_v2.html.markdown b/website/source/docs/providers/openstack/r/lb_member_v2.html.markdown index 9945e2506..5eee63189 100644 --- a/website/source/docs/providers/openstack/r/lb_member_v2.html.markdown +++ b/website/source/docs/providers/openstack/r/lb_member_v2.html.markdown @@ -1,6 +1,6 @@ --- layout: "openstack" -page_title: "OpenStack: openstack_lbaas_member_v2" +page_title: "OpenStack: openstack_lb_member_v2" sidebar_current: "docs-openstack-resource-lbaas-member-v2" description: |- Manages a V2 member resource within OpenStack. @@ -13,7 +13,7 @@ Manages a V2 member resource within OpenStack. ## Example Usage ``` -resource "openstack_lbaas_member_v2" "member_1" { +resource "openstack_lb_member_v2" "member_1" { address = "192.168.199.23" protocol_port = 8080 } @@ -31,6 +31,8 @@ The following arguments are supported: * `pool_id` - (Required) The id of the pool that this member will be assigned to. +* `subnet_id` - (Required) The subnet in which to access the member + * `name` - (Optional) Human-readable name for the member. * `tenant_id` - (Optional) Required for admins. The UUID of the tenant who owns diff --git a/website/source/docs/providers/openstack/r/lb_monitor_v2.html.markdown b/website/source/docs/providers/openstack/r/lb_monitor_v2.html.markdown index 6bc491d6f..bdc8fb429 100644 --- a/website/source/docs/providers/openstack/r/lb_monitor_v2.html.markdown +++ b/website/source/docs/providers/openstack/r/lb_monitor_v2.html.markdown @@ -1,6 +1,6 @@ --- layout: "openstack" -page_title: "OpenStack: openstack_lbaas_monitor_v2" +page_title: "OpenStack: openstack_lb_monitor_v2" sidebar_current: "docs-openstack-resource-lbaas-monitor-v2" description: |- Manages a V2 monitor resource within OpenStack. @@ -13,7 +13,7 @@ Manages a V2 monitor resource within OpenStack. ## Example Usage ``` -resource "openstack_lbaas_monitor_v2" "monitor_1" { +resource "openstack_lb_monitor_v2" "monitor_1" { type = "PING" delay = 20 timeout = 10 diff --git a/website/source/docs/providers/openstack/r/lb_pool_v2.html.markdown b/website/source/docs/providers/openstack/r/lb_pool_v2.html.markdown index f779c0f0d..8375cddd0 100644 --- a/website/source/docs/providers/openstack/r/lb_pool_v2.html.markdown +++ b/website/source/docs/providers/openstack/r/lb_pool_v2.html.markdown @@ -1,6 +1,6 @@ --- layout: "openstack" -page_title: "OpenStack: openstack_lbaas_pool_v2" +page_title: "OpenStack: openstack_lb_pool_v2" sidebar_current: "docs-openstack-resource-lbaas-pool-v2" description: |- Manages a V2 pool resource within OpenStack. @@ -13,7 +13,7 @@ Manages a V2 pool resource within OpenStack. ## Example Usage ``` -resource "openstack_lbaas_pool_v2" "pool_1" { +resource "openstack_lb_pool_v2" "pool_1" { protocol = "ProtocolHTTP" lb_method = "LBMethodRoundRobin" listener_id = "d9415786-5f1a-428b-b35f-2f1523e146d2"