Merge pull request #10 from bharathkkb/bug/pass-img-var

add img family, img project, shielded_vm
terraform-google-modules · Nov 11, 2019 · a680241 · a680241
2 parents d2541da + bec2ef8
commit a680241
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/main.tf b/main.tf
@@ -31,8 +31,10 @@ module "instance_template" {
     email  = google_service_account.bastion_host.email
     scopes = var.scopes
   }
-  enable_shielded_vm = true
-  startup_script     = var.startup_script
+  enable_shielded_vm   = var.shielded_vm
+  source_image_family  = var.image_family
+  source_image_project = var.image_project
+  startup_script       = var.startup_script
 
   metadata = {
     enable-oslogin = "TRUE"

diff --git a/variables.tf b/variables.tf
@@ -14,9 +14,14 @@
  * limitations under the License.
  */
 
-variable "image" {
-  description = "GCE image on which to base the Bastion. This image is supported by Shielded VM"
-  default     = "gce-uefi-images/centos-7"
+variable "image_family" {
+  description = "Source image family for the Bastion."
+  default     = "centos-7"
+}
+
+variable "image_project" {
+  description = "Project where the source image for the Bastion comes from"
+  default     = "gce-uefi-images"
 }
 
 variable "labels" {