openstack
/
fuel-octane
Code Issues Proposed changes

Merge "Restore the authorized_keys file in 'cobbler' container" into stable/7.0

This commit is contained in:
Jenkins 2016-03-02 22:05:38 +00:00 committed by Gerrit Code Review
parent 90b3545f22 2cf3c5dfe7
commit fc3158bc1b
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,