Merge pull request #281 from terraform-google-modules/ludo-cf-psc-2

CF via PSC: implement Andrea's suggestions
This commit is contained in:
Andrea Gandolfi 2021-07-20 15:35:49 +02:00 committed by GitHub
commit 555fefaeb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -21,7 +21,7 @@ curl https://YOUR_REGION-YOUR_PROJECT_ID.cloudfunctions.net/YOUR_FUNCTION_NAME
|---|---|:---: |:---:|:---:|
| project_id | Project id. | <code title="">string</code> | ✓ | |
| *ip_ranges* | IP ranges used for the VPCs. | <code title="object&#40;&#123;&#10;onprem &#61; string&#10;hub &#61; string&#10;&#125;&#41;">object({...})</code> | | <code title="&#123;&#10;onprem &#61; &#34;10.0.1.0&#47;24&#34;,&#10;hub &#61; &#34;10.0.2.0&#47;24&#34;&#10;&#125;">...</code> |
| *name* | Name used for new resources. | <code title="">string</code> | | <code title="">psc-onprem</code> |
| *name* | Name used for new resources. | <code title="">string</code> | | <code title="">cf-via-psc</code> |
| *project_create* | If non null, creates project instead of using an existing one. | <code title="object&#40;&#123;&#10;billing_account_id &#61; string&#10;parent &#61; string&#10;&#125;&#41;">object({...})</code> | | <code title="">null</code> |
| *psc_endpoint* | IP used for the Private Service Connect endpoint, it must not overlap with the hub_ip_range. | <code title="">string</code> | | <code title="">172.16.32.1</code> |
| *region* | Region where the resources will be created. | <code title="">string</code> | | <code title="">europe-west1</code> |

View File

@ -52,6 +52,9 @@ module "vpc-onprem" {
secondary_ip_range = {}
}
]
subnet_private_access = {
"${var.region}/${var.name}-onprem" = false
}
}
module "firewall-onprem" {

View File

@ -29,7 +29,7 @@ variable "ip_ranges" {
variable "name" {
description = "Name used for new resources."
type = string
default = "psc-onprem"
default = "cf-via-psc"
}
variable "project_create" {