Skip to content

Commit 57614ee

Browse files
Updated schema. API private key is now file upload.
1 parent 1938202 commit 57614ee

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

bastion.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ resource "null_resource" "cluster" {
326326
}
327327

328328
provisioner "file" {
329-
content = var.api_user_key
329+
content = base64decode(var.api_user_key)
330330
destination = "/opt/oci-hpc/autoscaling/credentials/key.initial"
331331
connection {
332332
host = oci_core_instance.bastion.public_ip

schema.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ variables:
156156
required: true
157157
description: "Availability Domain"
158158
title: "Availability Domain"
159+
159160
ssh_key:
160161
type: oci:core:ssh:publickey
161162
title: "Public SSH key"
@@ -174,10 +175,12 @@ variables:
174175
cluster_name:
175176
title: "Name of the cluster"
176177
description: "Custom cluster name"
178+
default: ""
177179
type: string
178180
visible:
179181
and:
180182
- ${use_custom_name}
183+
required: true
181184
bastion_ad:
182185
type: oci:identity:availabilitydomain:name
183186
dependsOn:
@@ -186,7 +189,7 @@ variables:
186189
required: true
187190
description: "Availability Domain for bastion host"
188191
title: "Availability Domain"
189-
default: ${ad}
192+
#default: ${ad}
190193
bastion_shape:
191194
type: oci:core:instanceshape:name
192195
dependsOn:
@@ -313,6 +316,7 @@ variables:
313316
- ${use_standard_image}
314317
- not:
315318
- ${unsupported_bastion}
319+
required: true
316320

317321
custom_bastion_image:
318322
title: "Bastion Image ID"
@@ -326,6 +330,7 @@ variables:
326330
- ${use_standard_image}
327331
- not:
328332
- ${unsupported_bastion}
333+
required: true
329334

330335
bastion_boot_volume_size:
331336
type: integer
@@ -720,6 +725,7 @@ variables:
720725
type: oci:identity:compartment:id
721726
visible: ${use_existing_vcn}
722727
default: ${targetCompartment}
728+
required: true
723729
vcn_id:
724730
type: oci:core:vcn:id
725731
visible:
@@ -811,6 +817,7 @@ variables:
811817
description: "Add the permanent cluster to a specific queue, workq is the default queue"
812818
visible:
813819
- ${slurm}
820+
814821
spack:
815822
type: boolean
816823
title: "Install Spack package manager"
@@ -839,12 +846,13 @@ variables:
839846
- ${autoscaling}
840847

841848
api_user_key:
842-
type: string
843-
title: "API key"
849+
type: file
850+
title: "API private key"
844851
default: ""
845852
visible:
846853
not:
847854
- ${inst_prin}
855+
required: true
848856

849857
api_fingerprint:
850858
type: string
@@ -853,6 +861,7 @@ variables:
853861
visible:
854862
not:
855863
- ${inst_prin}
864+
required: true
856865

857866
api_user_ocid:
858867
type: string
@@ -861,6 +870,7 @@ variables:
861870
visible:
862871
not:
863872
- ${inst_prin}
873+
required: true
864874

865875
configure:
866876
type: boolean
@@ -943,6 +953,7 @@ variables:
943953
- ${add_nfs}
944954
- not:
945955
- ${create_ffs}
956+
required: true
946957
monitoring_shape_name:
947958
type: string
948959
title: "MySQL Shape Name"

0 commit comments

Comments
 (0)