From 2cf3c5dfe72c0db70a9be82b459df6185fe8b93d Mon Sep 17 00:00:00 2001
From: Oleg Gelbukh <ogelbukh@mirantis.com>
Date: Tue, 1 Mar 2016 08:24:39 +0000
Subject: [PATCH] Restore the authorized_keys file in 'cobbler' container

SSH restore must go before Cobbler restore to ensure
that /etc/cobbler/authorized_keys file is updated
with appropriate public key.

Change-Id: Ie9493e883885cfc167920bfe35d5545d05c378e9
Closes-bug: 1551339
(cherry picked from commit f78d006175cf9c158d3c196702b1db1a4d234ddf)
---
 octane/handlers/backup_restore/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/octane/handlers/backup_restore/__init__.py b/octane/handlers/backup_restore/__init__.py
index 190024d7..1b85fd03 100644
--- a/octane/handlers/backup_restore/__init__.py
+++ b/octane/handlers/backup_restore/__init__.py
@@ -24,6 +24,9 @@ from octane.handlers.backup_restore import version
 
 ARCHIVATORS = [
     astute.AstuteArchivator,
+    # SSH restore must go before Cobbler restore so it updates
+    # /etc/cobbler/authorized_keys file automatically
+    ssh.SshArchivator,
     cobbler.CobblerArchivator,
     fuel_keys.FuelKeysArchivator,
     fuel_uuid.FuelUUIDArchivator,
@@ -31,7 +34,6 @@ ARCHIVATORS = [
     postgres.KeystoneArchivator,
     # Nailgun restore should be after puppet restore
     postgres.NailgunArchivator,
-    ssh.SshArchivator,
     version.VersionArchivator,
     nailgun_plugins.NailgunPluginsArchivator,
     puppet.PuppetApplyHost,