Merge pull request #1 from snafuz/main

Initial commit

Author: snafuz

main.tf

@@ -20,7 +20,7 @@ module "vsc_instance" {
   instance_flex_memory_in_gbs = var.instance_flex_memory_in_gbs 
   instance_flex_ocpus         = var.instance_flex_ocpus         
   # operating system parameters
-  ssh_public_keys = var.ssh_public_keys != "" ? var.ssh_public_keys : file(var.ssh_public_key_path)
+  ssh_public_keys = var.ssh_public_keys != "" ? var.ssh_public_keys : var.ssh_public_key_path != "" ? file(var.ssh_public_key_path) :""
   user_data = base64encode(data.template_file.cloud-config.rendered)
   # networking parameters
   public_ip            = var.public_ip 

release_files.json

@@ -23,6 +23,7 @@
       },
       {
         "src": "terraform/orm/provider_orm.tf",
+
         "dst": "provider.tf"
       }
     ]

variables.tf

@@ -58,8 +58,8 @@ variable "defined_tags" {
 }
 
 
-
 # compute instance parameters
+
 variable "shape" {
   description = "The shape of an instance."
   type        = string
@@ -91,23 +91,20 @@ variable "instance_ad_number" {
   default     = 1
 }
 
-
-
 # operating system parameters
 
-variable "ssh_public_key_path" {
-  description = "Public SSH key file path"
-  type = string
-  default = ""
-  
-}
-
+# if both ssh_public-keys and ssh_public_key_path are provided, ssh_public_keys takes priority
 variable "ssh_public_keys" {
   description = "Public SSH key(s) provided as string value"
   type = string
   default = ""
 }
 
+variable "ssh_public_key_path" {
+  description = "Public SSH key file path"
+  type = string
+  default = ""
+  
 
 # networking parameters