Merge conflict dealing with multiple entries for AuthorizedKeysFile

[pzakha]

There's a merge conflict between #2 and canonical/cloud-init#60.

Although the PR from Canonical does fix the issue of parsing multiple AuthorizedKeysFile entries in the sshd_config file, it also introduces unwanted behaviour that copies keys from all of the files listed in AuthorizedKeysFile into the default location for the user (~/.ssh/authorized_keys). To reduce future merge conflicts, I've decided to revert my original change (see commit Revert "DLPX-61319 Cloud-init fails to add authorized user ssh key"), do the merge, then fix the unwanted behaviour (see commit cloud-init should only consider keys in first file in AuthorizedKeysFile).

Pull request checklist

Please check if your PR fulfills the following requirements:

• Tests for the changes have been added (for bug fixes / features)
• Docs have been reviewed and added / updated if needed (for bug fixes / features)
• Build was run locally and any changes were pushed
• Lint has passed locally and any fixes were made for failures

Pull request type

Please check the type of change your PR introduces:

• Bugfix
• Feature
• Code style update (formatting, renaming)
• Refactoring (no functional changes, no api changes)
• Build related changes
• Documentation content changes
• Other (please describe): Merge with upstream

Testing

• git-ab-pre-push: http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/appliance-build-orchestrator-pre-push/2862/
• Manually verify which keys are copied: Done. Created 2 cli users bob and delphix and added an ssh key to each of them. Verified that those keys appeared under cli user. Re-run cloud-init via cloud-init clean -r and verify that those keys were not added under /export/home/delphix/.ssh/

[claassistantio]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ pzakha
❌ Delphix Engineering

---

Delphix Engineering seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[pzakha]

Fixes DLPX-68333