[baremetal] MaaS: Fix adding mcp.rsa.pub 65/47865/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 26 Nov 2017 23:11:28 +0000 (00:11 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 27 Nov 2017 17:00:21 +0000 (17:00 +0000)
commit03fd6c28b0fcc522816da8d59acfb53e07006307
treed3815849abf89a1103bce60a6fa91a2f2bc45f4d
parentb4cb2de10a932439d6089294f7bf29f01f6602da
[baremetal] MaaS: Fix adding mcp.rsa.pub

Upstream salt-formula-maas change [1] gated applying "maas_sshprefs"
low state by `region.sshprefs` being declared in reclass, which is
not true for our model.
Mend our region.sls patch to pass mcp.rsa.pub to MaaS unconditionally.
This fixes baremetal SSH login with mcp.rsa.

While at it, fix duplicate SSH key upload on MaaS state retry.

JIRA: FUEL-281

[1] https://github.com/salt-formulas/salt-formula-maas/commit/ec61dd6

Change-Id: I93941a689058f9f48f34861898fbe3ee6ce4e2b4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9a96a6292f82411a00faf373ca180cb32c26061c)
mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch