Merge branch 'main' into update/latest-timestamps

Author: wtripp180901

docs/experimental/pulp.md

@@ -1,11 +1,11 @@
 # Pulp Server
 
-In order to ensure reproducible builds, the appliance can build images using repository mirrors from StackHPC's "Ark" Pulp server. The appliance can sync relevant repositories to a local Pulp server which will then be used instead of Ark. Using a local Pulp can be enabled by adding `pulp` to the build groups and overriding `appliances_pulp_url` to point at the local Pulp's URL.
+In order to ensure reproducible builds, the appliance can build images using repository mirrors from StackHPC's "Ark" Pulp server. The appliance can sync relevant repositories to a local Pulp server which will then be used instead of Ark.
 
 ## Deploying/configuring Pulp Server
 
 ### Deploying a Pulp server
-A playbook is provided to install and configure a Pulp server on a given host. Admin credentials for this server are automatically generated through the `ansible/adhoc/generate-passwords.yml' playbook. This can be run with
+A playbook is provided to install and configure a Pulp server on a given host. Admin credentials for this server are automatically generated through the `ansible/adhoc/generate-passwords.yml` playbook. This can be run with
 `ansible-playbook ansible/adhoc/deploy-pulp.yml -e "pulp_server=<target_host>"`
 where `target_host` is any resolvable host. This will print a Pulp URL which can be copied to your environments as appropriate. Ensure that the server is accessible on the specified port. Note access to this server's content isn't authenticated so assumes the server is deployed behind a secure network.
 

environments/.stackhpc/LEAFCLOUD.pkrvars.hcl

@@ -4,4 +4,7 @@ networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]
-floating_ip_network = "external"
+# see environments/.stackhpc/inventory/group_vars/all/bastion.yml:
+ssh_bastion_username = "slurm-app-ci"
+ssh_bastion_host = "195.114.30.222"
+ssh_bastion_private_key_file = "~/.ssh/id_rsa"

environments/.stackhpc/SMS.pkrvars.hcl

@@ -2,6 +2,7 @@ flavor = "general.v1.small"
 networks = ["e2b9e59f-43da-4e1c-b558-dc9da4c0d738"] # stackhpc-ipv4-geneve
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
+# see environments/.stackhpc/inventory/group_vars/all/bastion.yml:
 ssh_bastion_username = "slurm-app-ci"
 ssh_bastion_host = "185.45.78.150"
-ssh_bastion_private_key_file = "~/.ssh/id_rsa"
+ssh_bastion_private_key_file = "~/.ssh/id_rsa"

requirements.yml

@@ -3,7 +3,7 @@ roles:
   - src: stackhpc.nfs
     version: v23.12.1 # Tolerate state nfs file handles
   - src: https://github.com/stackhpc/ansible-role-openhpc.git
-    version: v0.26.0 # https://github.com/stackhpc/ansible-role-openhpc/pull/168
+    version: v0.27.0
     name: stackhpc.openhpc
   - src: https://github.com/stackhpc/ansible-node-exporter.git
     version: stackhpc