From 93f8d97757dfe37d262a95148ac94f7a2c78a64e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 23 Aug 2017 15:38:06 +0200 Subject: p/fuel: Rebase after authorized_keys fix upstream Change-Id: Id53c2513b52d05a44dffda0fda40f8df259e226b Signed-off-by: Alexandru Avadanii --- ...s-maas-Add-mcp.rsa.pub-to-authorized_keys.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch (limited to 'patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch') diff --git a/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch b/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch deleted file mode 100644 index 8265abef..00000000 --- a/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 22 Aug 2017 22:04:28 +0200 -Subject: [PATCH] states/maas: Add mcp.rsa.pub to authorized_keys - -Add our mcp.rsa.pub RSA key to all nodes, including VCP VMs. -This is required for functest to be able to fetch openrc. - -While at it, add retry wrappers for more VCP VM state.sls calls. - -Change-Id: I34f79848c52e36de8d981055880321a081420874 -Signed-off-by: Alexandru Avadanii -Signed-off-by: Guillermo Herrero ---- - mcp/config/states/maas | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 52a9b77..fecd991 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -69,6 +69,9 @@ while [ $rc -ne 0 ]; do - sleep 5 - done - --salt -C '* and not cfg01* and not mas01*' saltutil.sync_all -+wait_for "salt -C '* and not cfg01* and not mas01*' ssh.set_auth_key ${SUDO_USER} \ -+ $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))" -+ -+wait_for "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" - salt -C '* and not cfg01* and not mas01*' state.apply salt - wait_for "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp" -- cgit 1.2.3-korg