From e0704943fc61fce97e5932071d6bbd30be6d393b Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 4 Mar 2019 16:11:03 -0800 Subject: [PATCH] Fix accidentally reverted OiCS changes (#3186) Signed-off-by: Modular Magician --- ...ource_compute_autoscaler_generated_test.go | 1 + ...ompute_region_autoscaler_generated_test.go | 1 + .../docs/r/compute_autoscaler.html.markdown | 87 +++++++++++++++++++ .../r/compute_region_autoscaler.html.markdown | 87 +++++++++++++++++++ 4 files changed, 176 insertions(+) diff --git a/google/resource_compute_autoscaler_generated_test.go b/google/resource_compute_autoscaler_generated_test.go index ea3128bb..fea10073 100644 --- a/google/resource_compute_autoscaler_generated_test.go +++ b/google/resource_compute_autoscaler_generated_test.go @@ -99,6 +99,7 @@ resource "google_compute_instance_group_manager" "foobar" { zone = "us-central1-f" instance_template = "${google_compute_instance_template.foobar.self_link}" + target_pools = ["${google_compute_target_pool.foobar.self_link}"] base_instance_name = "foobar" } diff --git a/google/resource_compute_region_autoscaler_generated_test.go b/google/resource_compute_region_autoscaler_generated_test.go index 2a398bfe..089793d8 100644 --- a/google/resource_compute_region_autoscaler_generated_test.go +++ b/google/resource_compute_region_autoscaler_generated_test.go @@ -99,6 +99,7 @@ resource "google_compute_region_instance_group_manager" "foobar" { region = "us-central1" instance_template = "${google_compute_instance_template.foobar.self_link}" + target_pools = ["${google_compute_target_pool.foobar.self_link}"] base_instance_name = "foobar" } diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown index 48425ba7..73aaca05 100644 --- a/website/docs/r/compute_autoscaler.html.markdown +++ b/website/docs/r/compute_autoscaler.html.markdown @@ -34,6 +34,92 @@ To get more information about Autoscaler, see: * How-to Guides * [Autoscaling Groups of Instances](https://cloud.google.com/compute/docs/autoscaler/) +
+ + Open in Cloud Shell + +
+## Example Usage - Autoscaler Beta + + +```hcl +resource "google_compute_autoscaler" "foobar" { + provider = "google-beta" + + name = "my-autoscaler" + zone = "us-central1-f" + target = "${google_compute_instance_group_manager.foobar.self_link}" + + autoscaling_policy { + max_replicas = 5 + min_replicas = 1 + cooldown_period = 60 + + cpu_utilization { + target = 0.5 + } + } +} + +resource "google_compute_instance_template" "foobar" { + provider = "google-beta" + + name = "my-instance-template" + machine_type = "n1-standard-1" + can_ip_forward = false + + tags = ["foo", "bar"] + + disk { + source_image = "${data.google_compute_image.debian_9.self_link}" + } + + network_interface { + network = "default" + } + + metadata = { + foo = "bar" + } + + service_account { + scopes = ["userinfo-email", "compute-ro", "storage-ro"] + } +} + +resource "google_compute_target_pool" "foobar" { + provider = "google-beta" + + name = "my-target-pool" +} + +resource "google_compute_instance_group_manager" "foobar" { + provider = "google-beta" + + name = "my-igm" + zone = "us-central1-f" + + version { + instance_template = "${google_compute_instance_template.foobar.self_link}" + name = "primary" + } + + target_pools = ["${google_compute_target_pool.foobar.self_link}"] + base_instance_name = "foobar" +} + +data "google_compute_image" "debian_9" { + provider = "google-beta" + + family = "debian-9" + project = "debian-cloud" +} + +provider "google-beta"{ + region = "us-central1" + zone = "us-central1-a" +} +```
Open in Cloud Shell @@ -92,6 +178,7 @@ resource "google_compute_instance_group_manager" "foobar" { zone = "us-central1-f" instance_template = "${google_compute_instance_template.foobar.self_link}" + target_pools = ["${google_compute_target_pool.foobar.self_link}"] base_instance_name = "foobar" } diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown index fcf73696..18350e3c 100644 --- a/website/docs/r/compute_region_autoscaler.html.markdown +++ b/website/docs/r/compute_region_autoscaler.html.markdown @@ -34,6 +34,92 @@ To get more information about RegionAutoscaler, see: * How-to Guides * [Autoscaling Groups of Instances](https://cloud.google.com/compute/docs/autoscaler/) +
+ + Open in Cloud Shell + +
+## Example Usage - Region Autoscaler Beta + + +```hcl +resource "google_compute_region_autoscaler" "foobar" { + provider = "google-beta" + + name = "my-region-autoscaler" + region = "us-central1" + target = "${google_compute_region_instance_group_manager.foobar.self_link}" + + autoscaling_policy { + max_replicas = 5 + min_replicas = 1 + cooldown_period = 60 + + cpu_utilization { + target = 0.5 + } + } +} + +resource "google_compute_instance_template" "foobar" { + provider = "google-beta" + + name = "my-instance-template" + machine_type = "n1-standard-1" + can_ip_forward = false + + tags = ["foo", "bar"] + + disk { + source_image = "${data.google_compute_image.debian_9.self_link}" + } + + network_interface { + network = "default" + } + + metadata = { + foo = "bar" + } + + service_account { + scopes = ["userinfo-email", "compute-ro", "storage-ro"] + } +} + +resource "google_compute_target_pool" "foobar" { + provider = "google-beta" + + name = "my-target-pool" +} + +resource "google_compute_region_instance_group_manager" "foobar" { + provider = "google-beta" + + name = "my-region-igm" + region = "us-central1" + + version { + instance_template = "${google_compute_instance_template.foobar.self_link}" + name = "primary" + } + + target_pools = ["${google_compute_target_pool.foobar.self_link}"] + base_instance_name = "foobar" +} + +data "google_compute_image" "debian_9" { + provider = "google-beta" + + family = "debian-9" + project = "debian-cloud" +} + +provider "google-beta"{ + region = "us-central1" + zone = "us-central1-a" +} +```
Open in Cloud Shell @@ -92,6 +178,7 @@ resource "google_compute_region_instance_group_manager" "foobar" { region = "us-central1" instance_template = "${google_compute_instance_template.foobar.self_link}" + target_pools = ["${google_compute_target_pool.foobar.self_link}"] base_instance_name = "foobar" }