diff options
| author | Rafi Khardalian <rafi@metacloud.com> | 2012-11-21 22:26:11 +0000 |
|---|---|---|
| committer | Rafi Khardalian <rafi@metacloud.com> | 2012-11-29 01:37:00 +0000 |
| commit | c21cbe8cd59bffe9b3d1fe9d9f4a8dc3da8cf313 (patch) | |
| tree | 8b72b6a303a12c8f68e01d46c954eb0f05151845 | |
| parent | 91fc376872516eb6259c24a17b78ede54681c17b (diff) | |
| download | nova-c21cbe8cd59bffe9b3d1fe9d9f4a8dc3da8cf313.tar.gz nova-c21cbe8cd59bffe9b3d1fe9d9f4a8dc3da8cf313.tar.xz nova-c21cbe8cd59bffe9b3d1fe9d9f4a8dc3da8cf313.zip | |
Remove start_guests_on_host_boot config option
Fixes bug 1081808
The start_guests_on_host_boot config option ignores any/all
user-requested VM state and attempts to start every VM assigned to the
hypervisor in question. This means even a VM which was suspended,
paused, in error state, etc will run through the process of attempting
to start. resume_guests_state_on_host_boot provides similar
functionality, except that it confirms the VM was previously in a
running state prior to attempting to restart on compute startup.
This patch will remove the config option entirely.
Flags: DocImpact
Change-Id: Ib26e74c46e17496bccf8e6fa3002fc4c78bde9e9
| -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) |