[baremetal] MaaS: Fix adding mcp.rsa.pub 13/47813/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 26 Nov 2017 23:11:28 +0000 (00:11 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 26 Nov 2017 23:33:03 +0000 (00:33 +0100)
commit9a96a6292f82411a00faf373ca180cb32c26061c
treef9a4ec3c5d9bbcc4d0257bd1cc103661e92344eb
parent8a867449217151f59766a74c6165ffc26c7f50b4
[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>
mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch