change destroy signature to match novas contract
Change-Id: I2e95185678ceba39e483ea4e3f98fd3aed92d1cb
This commit is contained in:
parent
700e4216d1
commit
fff1d51173
|
@ -83,7 +83,8 @@ openvz_conn_opts = [
|
||||||
default='eth0',
|
default='eth0',
|
||||||
help='Device to use as the root device for tc rules'),
|
help='Device to use as the root device for tc rules'),
|
||||||
cfg.StrOpt('ovz_tc_template_dir',
|
cfg.StrOpt('ovz_tc_template_dir',
|
||||||
default='$pybasedir/../openvz-nova-driver/ovznovadriver/openvz/network_drivers/templates',
|
default='$pybasedir/../openvz-nova-driver/'
|
||||||
|
'ovznovadriver/openvz/network_drivers/templates',
|
||||||
help='Where the tc templates are located'),
|
help='Where the tc templates are located'),
|
||||||
cfg.StrOpt('ovz_tmp_dir',
|
cfg.StrOpt('ovz_tmp_dir',
|
||||||
default='/var/tmp',
|
default='/var/tmp',
|
||||||
|
@ -1386,8 +1387,8 @@ class OpenVzDriver(driver.ComputeDriver):
|
||||||
'rm', '-f', filename, run_as_root=True,
|
'rm', '-f', filename, run_as_root=True,
|
||||||
raise_on_error=False)
|
raise_on_error=False)
|
||||||
|
|
||||||
def destroy(self, instance, network_info, block_device_info=None,
|
def destroy(self, context, instance, network_info, block_device_info=None,
|
||||||
destroy_disks=True, context=None):
|
destroy_disks=True):
|
||||||
"""
|
"""
|
||||||
Destroy (shutdown and delete) the specified instance.
|
Destroy (shutdown and delete) the specified instance.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue