summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch')
-rw-r--r--patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch31
1 files changed, 0 insertions, 31 deletions
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 <Alexandru.Avadanii@enea.com>
-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 <Alexandru.Avadanii@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
- 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"