Merge pull request #1000 from apichick/adfs-fixes

ADFS blueprint fixes
GoogleCloudPlatform · Nov 28, 2022 · e39ae69 · e39ae69
2 parents 1f5e2f9 + 48c6733
commit e39ae69
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/blueprints/cloud-operations/adfs/ansible/playbook.yaml b/blueprints/cloud-operations/adfs/ansible/playbook.yaml
@@ -14,7 +14,7 @@
 
 - name: Prepare
   hosts: adfs
-  gather_facts: yes
+  gather_facts: no
   vars_files:
     - vars/vars.yaml
   roles:

diff --git a/blueprints/cloud-operations/adfs/main.tf b/blueprints/cloud-operations/adfs/main.tf
@@ -24,8 +24,9 @@ module "project" {
     ? var.project_create.parent
     : null
   )
-  prefix = var.project_create == null ? null : var.prefix
-  name   = var.project_id
+  project_create = var.project_create != null
+  prefix         = var.project_create == null ? null : var.prefix
+  name           = var.project_id
   services = [
     "compute.googleapis.com",
     "dns.googleapis.com",

diff --git a/tests/blueprints/cloud_operations/adfs/fixture/variables.tf b/tests/blueprints/cloud_operations/adfs/fixture/variables.tf
@@ -31,7 +31,10 @@ variable "project_create" {
     billing_account_id = string
     parent             = string
   })
-  default = null
+  default = {
+    billing_account_id = "12345-12345-12345"
+    parent             = "folders/123456789"
+  }
 }
 
 variable "project_id" {