Fix logic for public SSH deploy keys

Author: m-bull

roles/cluster_infra/defaults/main.yml

@@ -51,11 +51,4 @@ cluster_groups_zenith:
   # Any hosts in the grafana and openondemand groups should go in the zenith group
   zenith: [grafana, openondemand]
 
-# Deploy user SSH keys
-cluster_deploy_ssh_keys: >-
-  {{
-     cluster_deploy_ssh_additional_public_keys | default([]) +
-     ( [cluster_deploy_ssh_public_key]
-     if cluster_deploy_ssh_public_key is defined
-     else [] )
-  }}
+cluster_deploy_ssh_keys_extra: []

roles/cluster_infra/templates/resources.tf.j2

@@ -264,10 +264,16 @@ resource "openstack_compute_instance_v2" "login" {
   user_data = <<-EOF
     #cloud-config
     ssh_authorized_keys:
+    {%- if cluster_user_ssh_public_key is defined %}
+      - {{ cluster_user_ssh_public_key }}
+    {%- endif %}
+    {%- if cluster_deploy_ssh_public_key is defined %}
+      - {{ cluster_deploy_ssh_public_key }}
+    {%- endif %}
     {%- if cluster_ssh_private_key_file is not defined %}
       - "${openstack_compute_keypair_v2.cluster_keypair.public_key}"
     {%- endif %}
-    {%- for ssh_key in cluster_deploy_ssh_keys %}
+    {%- for ssh_key in cluster_deploy_ssh_keys_extra %}
       - {{ ssh_key }}
     {%- endfor %}
   EOF
@@ -315,10 +321,16 @@ resource "openstack_compute_instance_v2" "control" {
   user_data = <<-EOF
     #cloud-config
     ssh_authorized_keys:
+    {%- if cluster_user_ssh_public_key is defined %}
+      - {{ cluster_user_ssh_public_key }}
+    {%- endif %}
+    {%- if cluster_deploy_ssh_public_key is defined %}
+      - {{ cluster_deploy_ssh_public_key }}
+    {%- endif %}
     {%- if cluster_ssh_private_key_file is not defined %}
       - "${openstack_compute_keypair_v2.cluster_keypair.public_key}"
     {%- endif %}
-    {%- for ssh_key in cluster_deploy_ssh_keys %}
+    {%- for ssh_key in cluster_deploy_ssh_keys_extra %}
       - {{ ssh_key }}
     {%- endfor %}
     fs_setup:
@@ -352,10 +364,16 @@ resource "openstack_compute_instance_v2" "{{ partition.name }}" {
   user_data = <<-EOF
     #cloud-config
     ssh_authorized_keys:
+    {%- if cluster_user_ssh_public_key is defined %}
+      - {{ cluster_user_ssh_public_key }}
+    {%- endif %}
+    {%- if cluster_deploy_ssh_public_key is defined %}
+      - {{ cluster_deploy_ssh_public_key }}
+    {%- endif %}
     {%- if cluster_ssh_private_key_file is not defined %}
       - "${openstack_compute_keypair_v2.cluster_keypair.public_key}"
     {%- endif %}
-    {%- for ssh_key in cluster_deploy_ssh_keys %}
+    {%- for ssh_key in cluster_deploy_ssh_keys_extra %}
       - {{ ssh_key }}
     {%- endfor %}
   EOF