Skip to content

Commit

Permalink
Updated schema. API private key is now file upload.
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcinZablocki committed Sep 24, 2021
1 parent 1938202 commit 57614ee
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bastion.tf
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ resource "null_resource" "cluster" {
}

provisioner "file" {
content = var.api_user_key
content = base64decode(var.api_user_key)
destination = "/opt/oci-hpc/autoscaling/credentials/key.initial"
connection {
host = oci_core_instance.bastion.public_ip
Expand Down
17 changes: 14 additions & 3 deletions schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ variables:
required: true
description: "Availability Domain"
title: "Availability Domain"

ssh_key:
type: oci:core:ssh:publickey
title: "Public SSH key"
Expand All @@ -174,10 +175,12 @@ variables:
cluster_name:
title: "Name of the cluster"
description: "Custom cluster name"
default: ""
type: string
visible:
and:
- ${use_custom_name}
required: true
bastion_ad:
type: oci:identity:availabilitydomain:name
dependsOn:
Expand All @@ -186,7 +189,7 @@ variables:
required: true
description: "Availability Domain for bastion host"
title: "Availability Domain"
default: ${ad}
#default: ${ad}
bastion_shape:
type: oci:core:instanceshape:name
dependsOn:
Expand Down Expand Up @@ -313,6 +316,7 @@ variables:
- ${use_standard_image}
- not:
- ${unsupported_bastion}
required: true

custom_bastion_image:
title: "Bastion Image ID"
Expand All @@ -326,6 +330,7 @@ variables:
- ${use_standard_image}
- not:
- ${unsupported_bastion}
required: true

bastion_boot_volume_size:
type: integer
Expand Down Expand Up @@ -720,6 +725,7 @@ variables:
type: oci:identity:compartment:id
visible: ${use_existing_vcn}
default: ${targetCompartment}
required: true
vcn_id:
type: oci:core:vcn:id
visible:
Expand Down Expand Up @@ -811,6 +817,7 @@ variables:
description: "Add the permanent cluster to a specific queue, workq is the default queue"
visible:
- ${slurm}

spack:
type: boolean
title: "Install Spack package manager"
Expand Down Expand Up @@ -839,12 +846,13 @@ variables:
- ${autoscaling}

api_user_key:
type: string
title: "API key"
type: file
title: "API private key"
default: ""
visible:
not:
- ${inst_prin}
required: true

api_fingerprint:
type: string
Expand All @@ -853,6 +861,7 @@ variables:
visible:
not:
- ${inst_prin}
required: true

api_user_ocid:
type: string
Expand All @@ -861,6 +870,7 @@ variables:
visible:
not:
- ${inst_prin}
required: true

configure:
type: boolean
Expand Down Expand Up @@ -943,6 +953,7 @@ variables:
- ${add_nfs}
- not:
- ${create_ffs}
required: true
monitoring_shape_name:
type: string
title: "MySQL Shape Name"
Expand Down

0 comments on commit 57614ee

Please sign in to comment.