Merge pull request openstack-k8s-operators#1044 from openshift-cherry…

…pick-robot/cherry-pick-1043-to-v1.3.x

[v1.3.x] [OSPK8-803] Use list format for SSH authorized keys in OSBMS cloud-init

controllers/openstackbaremetalset_controller.go

@@ -1101,7 +1101,14 @@ func (r *OpenStackBaremetalSetReconciler) cloudInitProvision(ctx context.Context
 		// Automatically generate user data cloud-init secret (i.e. user did not
 		// already manually create it for the BMH)
 		templateParameters := make(map[string]interface{})
-		templateParameters["AuthorizedKeys"] = sshSecret
+
+		// Split the keys into a list of separate strings, as cloud-init wants a list
+		// (a single-key string also works, but if there multiple keys in that string
+		// then passing the keys as a string results in *none* of them working, so it
+		// is better to create a list always)
+		splitKeys := strings.Split(strings.TrimSuffix(string(sshSecret), "\n"), "\n")
+		templateParameters["AuthorizedKeys"] = splitKeys
+
 		templateParameters["Hostname"] = hostName
 		templateParameters["DomainName"] = osNetCfg.Spec.DomainName
 

templates/baremetalset/cloudinit/userdata

@@ -3,7 +3,12 @@
 fqdn: {{ .Hostname }}{{ if .DomainName }}.{{ .DomainName }}{{ end }}
 users:
   - name: cloud-admin
-    ssh-authorized-keys: {{ .AuthorizedKeys }}
+    ssh_authorized_keys:
+{{ range $ssh_key := .AuthorizedKeys }}
+{{ if not (eq $ssh_key "") }}
+      - {{ $ssh_key }}
+{{ end }}
+{{ end }}
     sudo: ['ALL=(ALL) NOPASSWD:ALL']
     shell: /bin/bash
 {{- if .NodeRootPassword }}