openstack
/
fuel-octane
Code Issues Proposed changes

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
This commit is contained in:
Oleg Gelbukh 2016-03-01 08:24:39 +00:00
parent 8f0019b150
commit f78d006175
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octane/handlers/backup_restore/__init__.py
View File

@ -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,