From 49e776981c16ef2b8e87d7a622fbec778fe210fd Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 2 Feb 2017 16:55:35 +0400 Subject: Enable fuel plugin of tacker Change-Id: I172d4d0948559200b8f9e6fbe91159b80ab734ba Signed-off-by: Michael Polenchuk --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_tacker-pluginbuild/config.mk | 2 +- deploy/config/plugins/fuel-tacker_1.0.0.yaml | 48 ++++++++++++++++++++++ .../ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 14 +++---- .../no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 14 +++---- 5 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 deploy/config/plugins/fuel-tacker_1.0.0.yaml diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 617e36515..bed728d4a 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild +PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild diff --git a/build/f_isoroot/f_tacker-pluginbuild/config.mk b/build/f_isoroot/f_tacker-pluginbuild/config.mk index 2de94d57e..1300a6687 100644 --- a/build/f_isoroot/f_tacker-pluginbuild/config.mk +++ b/build/f_isoroot/f_tacker-pluginbuild/config.mk @@ -9,4 +9,4 @@ TACKER_BRANCH?=master TACKER_REPO?="https://github.com/openstack/fuel-plugin-tacker" -TACKER_CHANGE?=e49db23fa2392e2cc42ac15ce22e869ff9cb0e0c +TACKER_CHANGE?=573344416182024791831150c70fe240867716e9 diff --git a/deploy/config/plugins/fuel-tacker_1.0.0.yaml b/deploy/config/plugins/fuel-tacker_1.0.0.yaml new file mode 100644 index 000000000..538975439 --- /dev/null +++ b/deploy/config/plugins/fuel-tacker_1.0.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.2 + created: 02.02.2017 + comment: Fuel 10 support +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: 1.0.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/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index c4789484c..f02949f94 100644 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 SFC HA deployment - version: 0.0.2 + version: 0.0.3 created: Feb 10 2016 - comment: Rebased to Fuel9 + comment: Rebased to Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,27 +34,27 @@ deployment-scenario-metadata: stack-extensions: - module: fuel-plugin-ovs module-config-name: fuel-nshovs - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - install_nsh: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - enable_sfc: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: tacker module-config-name: fuel-tacker - module-config-version: 0.9.0 + module-config-version: 1.0.0 # Note that the module substitionion does not support arrays # This is a quick fix # - module: opendaylight 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 90a45d577..6abea7b77 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 @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2-SFC No-HA deployment - version: 0.0.3 + version: 0.0.4 created: Feb 10 2016 - comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel9 + comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,27 +34,27 @@ deployment-scenario-metadata: stack-extensions: - module: fuel-plugin-ovs module-config-name: fuel-nshovs - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - install_nsh: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - enable_sfc: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: tacker module-config-name: fuel-tacker - module-config-version: 0.9.0 + module-config-version: 1.0.0 # Note that the module substitionion does not support arrays # This is a quick fix -- cgit 1.2.3-korg