diff options
| -rw-r--r-- | etc/nova/nova.conf.sample | 3 | ||||
| -rw-r--r-- | nova/compute/manager.py | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index f44b034a0..5cd8f6bc1 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -276,9 +276,6 @@ # bandwidth_poll_interval=600 #### (IntOpt) interval to pull bandwidth usage info -# start_guests_on_host_boot=false -#### (BoolOpt) Whether to restart guests when the host reboots - # resume_guests_state_on_host_boot=false #### (BoolOpt) Whether to start guests that were running before the host #### rebooted diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c32d6e343..8ffe91ea9 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -102,9 +102,6 @@ compute_opts = [ default=False, help='Whether to start guests that were running before the ' 'host rebooted'), - cfg.BoolOpt('start_guests_on_host_boot', - default=False, - help='Whether to restart guests when the host reboots'), ] interval_opts = [ @@ -390,8 +387,7 @@ class ComputeManager(manager.SchedulerDependentManager): legacy_net_info = self._legacy_nw_info(net_info) self.driver.plug_vifs(instance, legacy_net_info) - if ((expect_running and CONF.resume_guests_state_on_host_boot) - or CONF.start_guests_on_host_boot): + if expect_running and CONF.resume_guests_state_on_host_boot: LOG.info( _('Rebooting instance after nova-compute restart.'), locals(), instance=instance) |