From 6ca97fede4fa8bd13139bd7e3ddebb55f457e290 Mon Sep 17 00:00:00 2001 From: Steve Brasier <33413598+sjpb@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:35:53 +0000 Subject: [PATCH] Improve leafcloud CI support (#374) * use proper leafcloud jumphost user * use cheaper leafcloud flavor * add leafcloud packer vars file --- environments/.stackhpc/LEAFCLOUD.pkrvars.hcl | 11 +++++++++++ .../.stackhpc/inventory/group_vars/all/bastion.yml | 2 +- environments/.stackhpc/terraform/LEAFCLOUD.tfvars | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 environments/.stackhpc/LEAFCLOUD.pkrvars.hcl diff --git a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl new file mode 100644 index 000000000..2f325d754 --- /dev/null +++ b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl @@ -0,0 +1,11 @@ +flavor = "en1.xsmall" +use_blockstorage_volume = true +volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny +image_disk_format = "qcow2" +networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci +source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298 +fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2" +ssh_keypair_name = "slurm-app-ci" +ssh_private_key_file = "~/.ssh/id_ed25519" +security_groups = ["default", "SSH"] +floating_ip_network = "external" diff --git a/environments/.stackhpc/inventory/group_vars/all/bastion.yml b/environments/.stackhpc/inventory/group_vars/all/bastion.yml index 626f9ff5c..94287827c 100644 --- a/environments/.stackhpc/inventory/group_vars/all/bastion.yml +++ b/environments/.stackhpc/inventory/group_vars/all/bastion.yml @@ -4,7 +4,7 @@ bastion_config: user: slurm-app-ci ip: 128.232.222.183 LEAFCLOUD: - user: rocky + user: slurm-app-ci ip: 195.114.30.222 # NB: The bastion_{user,ip} variables are used directly in the CI workflow too bastion_user: "{{ bastion_config[ci_cloud].user }}" diff --git a/environments/.stackhpc/terraform/LEAFCLOUD.tfvars b/environments/.stackhpc/terraform/LEAFCLOUD.tfvars index ec152ca42..5e73896c8 100644 --- a/environments/.stackhpc/terraform/LEAFCLOUD.tfvars +++ b/environments/.stackhpc/terraform/LEAFCLOUD.tfvars @@ -1,6 +1,6 @@ cluster_net = "slurmapp-ci" cluster_subnet = "slurmapp-ci" control_node_flavor = "ec1.medium" # small ran out of memory, medium gets down to ~100Mi mem free on deployment -other_node_flavor = "ec1.small" +other_node_flavor = "en1.xsmall" state_volume_type = "unencrypted" home_volume_type = "unencrypted"