From a2823828c24443563cbbb1b91182cc472bda588b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Feb 2018 12:22:19 +0000 Subject: Update git submodules * Update docs/submodules/fuel from branch 'master' - Merge "[patch] MaaS: mcp.rsa.pub to auth keys via pillar" - [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 --- docs/submodules/fuel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/submodules/fuel') diff --git a/docs/submodules/fuel b/docs/submodules/fuel index 30993030e..00839253e 160000 --- a/docs/submodules/fuel +++ b/docs/submodules/fuel @@ -1 +1 @@ -Subproject commit 30993030ea4b5a35ab4ae9d0aeb6be85c1e259c3 +Subproject commit 00839253ec6cc31fdabe7cacdc23b9ffadfb2bba -- cgit 1.2.3-korg