[patch] MaaS: mcp.rsa.pub to auth keys via pillar 21/52121/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 13 Feb 2018 02:34:10 +0000 (03:34 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 13 Feb 2018 18:47:17 +0000 (19:47 +0100)
commitaf65ce60c5ab69816cbe8b4c1c7b4c5922304205
treeece84798bf9b73ca7036d136886bb9525b41f806
parentbfc61428e35c92cbed253e98133d7891cc2d6833
[patch] MaaS: mcp.rsa.pub to auth keys via pillar

Drop one questionable patch responsible for MaaS node authorized
keys to include mcp.rsa.pub by reading the contents of authorized
keys on mas01, assuming mcp.rsa.pub will be on the first line.

Instead, export the contents of the public key using a shell env
var during deploy, which gets expanded via maas_pdf j2 template
into a reclass param, leveraging existing salt-formula-maas sshprefs
mechanism for delivering the key to MaaS.

Since we require the public key to exist before expanding templates,
move `generate_ssh_key` call outside the current infrastructure
handling block, allowing it to execute during all `deploy.sh` calls,
even for dry-runs.

Change-Id: I0f53b0f764a2fafd292e0ffd399c284acf61bd30
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
ci/deploy.sh
mcp/patches/0004-maas-region-use-authorized_keys-1st-entry.patch [deleted file]
mcp/patches/patches.list
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2