diff options
6 files changed, 67 insertions, 12 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 466aba2ae..55facfe4f 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,9 +8,8 @@ ############################################################################## FUEL_PLUGIN_ODL_BRANCH ?= master -FUEL_PLUGIN_ODL_CHANGE ?= 0ff4ebdbfe5f681f0b44eea14c9c2b3dbb10b1d5 +FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1 FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz -export ODL_VERSION_NUMBER?=0.4.3 -export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC3.5.tar.gz +export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz +export ODL_VERSION_NUMBER?=0.5.0 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/config/plugins/fuel-tacker_0.9.0.yaml b/deploy/config/plugins/fuel-tacker_0.9.0.yaml new file mode 100644 index 000000000..71e028ffd --- /dev/null +++ b/deploy/config/plugins/fuel-tacker_0.9.0.yaml @@ -0,0 +1,48 @@ +############################################################################## +# Copyright (c) 2015,2016 Ericsson AB and others. +# mskalski@mirantis.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +plugin-config-metadata: + title: Tacker fuel plugin configuration template + version: 0.1 + created: 03.10.2016 + comment: None +tacker: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: Tacker VNF manager + toggleable: true + versions: + - metadata: + group: 'openstack_services' + db_password: + generator: 'password' + user_password: + generator: 'password' + user: 'tacker' + port: 8889 + service: 'tacker-server' + restrictions: + - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled == false or settings:opendaylight.enable_sfc.value == false" + strict: false + message: "Please install OpenDaylight Plugin with SFC features enabled" + - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false" + strict: false + message: "Please install and enable Openvswitch plugin with NSH support." + #plugin_id: Assigned during installation + plugin_version: 0.2.0 + debug: + value: false + label: 'Debug logging' + description: 'Debug logging mode provides more information, but requires more disk space.' + weight: 25 + type: "checkbox" + weight: 70 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: diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index e6aef2aba..c4789484c 100644 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# Copyright (c) 2015,2016 Ericsson AB and others. # jonas.bjurel@ericsson.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -22,7 +22,7 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 SFC HA deployment - version: 0.0.1 + version: 0.0.2 created: Feb 10 2016 comment: Rebased to Fuel9 @@ -52,6 +52,9 @@ stack-extensions: value: true metadata: plugin_version: 0.9.0 + - module: tacker + module-config-name: fuel-tacker + module-config-version: 0.9.0 # Note that the module substitionion does not support arrays # This is a quick fix # - module: opendaylight @@ -78,7 +81,7 @@ dea-override-config: role: controller,opendaylight - id: 2 interfaces: interfaces_1 - role: mongo,controller + role: mongo,controller,tacker - id: 3 interfaces: interfaces_1 role: ceph-osd,controller diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index a8d9ed848..90a45d577 100644 --- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# Copyright (c) 2015,2016 Ericsson AB and others. # jonas.bjurel@ericsson.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -22,7 +22,7 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2-SFC No-HA deployment - version: 0.0.2 + version: 0.0.3 created: Feb 10 2016 comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel9 @@ -52,6 +52,9 @@ stack-extensions: value: true metadata: plugin_version: 0.9.0 + - module: tacker + module-config-name: fuel-tacker + module-config-version: 0.9.0 # Note that the module substitionion does not support arrays # This is a quick fix @@ -76,7 +79,7 @@ dea-override-config: nodes: - id: 1 interfaces: interfaces_1 - role: mongo,controller + role: mongo,controller,tacker - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight |