Skip to content

Commit 7082ac9

Browse files
authored
Add wait time for orgpolicy in shared reservation examples (#15464)
1 parent bd6a648 commit 7082ac9

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

mmv1/products/compute/Reservation.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ examples:
8282
org_id: 'ORG_ID'
8383
billing_account: 'BILLING_ACCT'
8484
exclude_docs: true
85+
external_providers: ["time"]
8586
- name: 'shared_reservation_beta'
8687
primary_resource_id: 'gce_reservation'
8788
vars:
@@ -92,6 +93,7 @@ examples:
9293
billing_account: 'BILLING_ACCT'
9394
exclude_docs: true
9495
min_version: 'beta'
96+
external_providers: ["time"]
9597
parameters:
9698
- name: 'zone'
9799
type: ResourceRef

mmv1/templates/terraform/examples/shared_reservation_basic.tf.tmpl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ resource "google_org_policy_policy" "shared_reservation_org_policy" {
3030
}
3131
}
3232

33+
resource "time_sleep" "wait_orgpolicy" {
34+
depends_on = [google_org_policy_policy.shared_reservation_org_policy]
35+
create_duration = "60s"
36+
}
37+
3338
resource "google_compute_reservation" "{{$.PrimaryResourceId}}" {
3439
project = google_project.owner_project.project_id
3540
name = "{{index $.Vars "reservation_name"}}"
@@ -49,5 +54,5 @@ resource "google_compute_reservation" "{{$.PrimaryResourceId}}" {
4954
project_id = google_project.guest_project.project_id
5055
}
5156
}
52-
depends_on = [google_org_policy_policy.shared_reservation_org_policy,google_project_service.compute]
53-
}
57+
depends_on = [time_sleep.wait_orgpolicy,google_project_service.compute]
58+
}

mmv1/templates/terraform/examples/shared_reservation_beta.tf.tmpl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ resource "google_org_policy_policy" "shared_reservation_org_policy" {
3434
}
3535
}
3636

37+
resource "time_sleep" "wait_orgpolicy" {
38+
depends_on = [google_org_policy_policy.shared_reservation_org_policy]
39+
create_duration = "60s"
40+
}
41+
3742
resource "google_compute_reservation" "{{$.PrimaryResourceId}}" {
3843
provider = google-beta
3944
project = google_project.owner_project.project_id
@@ -51,5 +56,5 @@ resource "google_compute_reservation" "{{$.PrimaryResourceId}}" {
5156
share_type = "SPECIFIC_PROJECTS"
5257
projects = [google_project.guest_project.name]
5358
}
54-
depends_on = [google_org_policy_policy.shared_reservation_org_policy,google_project_service.compute]
55-
}
59+
depends_on = [time_sleep.wait_orgpolicy,google_project_service.compute]
60+
}

0 commit comments

Comments
 (0)