aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/config/plugins/fuel-odl_0.9.0.yaml4
-rw-r--r--deploy/environments/execution_environment.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml
index 6caf4834f..9646d021f 100644
--- a/deploy/config/plugins/fuel-odl_0.9.0.yaml
+++ b/deploy/config/plugins/fuel-odl_0.9.0.yaml
@@ -118,9 +118,9 @@ opendaylight:
vpn:
- odl-vpnservice-openstack
odl_deb: opendaylight
- experimental_odl_deb: opendaylight-boron
+ experimental_odl_deb: opendaylight-experimental
use_experimental_odl:
- - enable_sfc
+ - enable_bgpvpn
#plugin_id: Assigned during installation
plugin_version: 0.9.0
restrictions:
diff --git a/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py
index 3812902aa..7a0b4744e 100644
--- a/deploy/environments/execution_environment.py
+++ b/deploy/environments/execution_environment.py
@@ -47,6 +47,8 @@ class ExecutionEnvironment(object):
log('Deleting VM %s with disks %s' % (vm_name, disk_files))
exec_cmd('virsh destroy %s' % vm_name, False)
exec_cmd('virsh undefine --managed-save --remove-all-storage %s' % vm_name, False)
+ for file in disk_files:
+ delete(file)
def overwrite_xml(self, vm_xml, vm_definition_overwrite):
if not vm_definition_overwrite: