Merge "Restore the authorized_keys file in 'cobbler' container" into stable/7.0
This commit is contained in:
commit
fc3158bc1b
@ -24,6 +24,9 @@ from octane.handlers.backup_restore import version
|
|||||||
|
|
||||||
ARCHIVATORS = [
|
ARCHIVATORS = [
|
||||||
astute.AstuteArchivator,
|
astute.AstuteArchivator,
|
||||||
|
# SSH restore must go before Cobbler restore so it updates
|
||||||
|
# /etc/cobbler/authorized_keys file automatically
|
||||||
|
ssh.SshArchivator,
|
||||||
cobbler.CobblerArchivator,
|
cobbler.CobblerArchivator,
|
||||||
fuel_keys.FuelKeysArchivator,
|
fuel_keys.FuelKeysArchivator,
|
||||||
fuel_uuid.FuelUUIDArchivator,
|
fuel_uuid.FuelUUIDArchivator,
|
||||||
@ -31,7 +34,6 @@ ARCHIVATORS = [
|
|||||||
postgres.KeystoneArchivator,
|
postgres.KeystoneArchivator,
|
||||||
# Nailgun restore should be after puppet restore
|
# Nailgun restore should be after puppet restore
|
||||||
postgres.NailgunArchivator,
|
postgres.NailgunArchivator,
|
||||||
ssh.SshArchivator,
|
|
||||||
version.VersionArchivator,
|
version.VersionArchivator,
|
||||||
nailgun_plugins.NailgunPluginsArchivator,
|
nailgun_plugins.NailgunPluginsArchivator,
|
||||||
puppet.PuppetApplyHost,
|
puppet.PuppetApplyHost,
|
||||||
|
Loading…
Reference in New Issue
Block a user