From 0c0cc4756e1e95b461da56d538e0dedd1052f0fe Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Wed, 27 Jul 2016 18:33:53 +0200 Subject: Fix configuration for kvm scenario JIRA: FUEL-157 Change-Id: I5baafd4395a2d298a24cccda042d5b43824ae7a0 Signed-off-by: Michal Skalski --- deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml | 34 ++++++++++++++++++++++ .../ha_nfv-kvm_heat_ceilometer_scenario.yaml | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml diff --git a/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml b/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml new file mode 100644 index 000000000..85f3221f7 --- /dev/null +++ b/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2015 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 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +plugin-config-metadata: + title: NFV KVM fuel Plugin configuration template + version: 0.9.0 + created: 27.07.2016 + comment: None + +fuel-plugin-kvm: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: fuel-plugin-kvm + toggleable: true + versions: + - metadata: + always_editable: false + #plugin_id: 1 Assigned during installation + plugin_version: 0.9.0 + use_kvm: + label: 'EXPERIMENTAL: KVM enhancements for NFV' + type: checkbox + value: true + weight: 20 + weight: 70 diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml index 2941a726e..f9863d11e 100644 --- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml @@ -22,8 +22,8 @@ # deployment configuration meta-data deployment-scenario-metadata: title: NFV KVM HA deployment - version: 0.0.5 - created: Mar 18 2016 + version: 0.0.6 + created: 27.07.2016 comment: Ceph cannot be assigned to compute, ceph is collocated with one of the controllers ############################################################################## @@ -32,9 +32,9 @@ deployment-scenario-metadata: # /_.yaml # It does so by copying the config file to the local plugin config directory stack-extensions: - - module: fuel-plugin-qemu + - module: fuel-plugin-kvm module-config-name: fuel-nfvkvm - module-config-version: 0.0.2 + module-config-version: 0.9.0 module-config-override: # Module config overrides -- cgit 1.2.3-korg