From 9f4826d4472ae1a7a90045660e74b1db2734e72a Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 22 Feb 2016 13:15:02 -0500 Subject: [PATCH] provider/google: Document schema conflict in network --- .../docs/providers/google/r/compute_network.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/google/r/compute_network.html.markdown b/website/source/docs/providers/google/r/compute_network.html.markdown index bd9820551f..2244089950 100644 --- a/website/source/docs/providers/google/r/compute_network.html.markdown +++ b/website/source/docs/providers/google/r/compute_network.html.markdown @@ -29,14 +29,15 @@ The following arguments are supported: * `ipv4_range` - (Optional) The IPv4 address range that machines in this network are assigned to, represented as a CIDR block. If not set, an auto or custom subnetted network will be created, depending - on the value of `auto_create_subnetworks` attribute. + on the value of `auto_create_subnetworks` attribute. This attribute + may not be used if `auto_create_subnets` is specified. * `auto_create_subnetworks` - (Optional) If set to true, this network will be created in auto subnet mode, and Google will create a subnet for each region automatically. If set to false, and `ipv4_range` is not set, a custom subnetted network will be created that can support `google_compute_subnetwork` - resources. + resources. This attribute may not be used if `ipv4_range` is specified. ## Attributes Reference