Merge "KVMFORNFV: Implementing kvmfornfv Scenarios."

3 files changed, 204 insertions, 0 deletions

diff --git a/deploy/config/plugins/fuel-barometer_1.0.0.yaml b/deploy/config/plugins/fuel-barometer_1.0.0.yaml
new file mode 100644
index 000000000..81e66833d
--- /dev/null
+++ b/deploy/config/plugins/fuel-barometer_1.0.0.yaml
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2017 Intel Corp.
+# navyax.bathula@intel.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: Barometer Plugin
+  version: 1.0.0
+  created: 06.02.2017
+  comment: Deploy Barometer plugin
+
+fuel-plugin-collectd-ceilometer:
+  metadata:
+    class: plugin
+    default: false
+    enabled: true
+    label: fuel-plugin-collectd-ceilometer
+    toggleable: true
+    versions:
+    - metadata:
+        always_editable: false
+        plugin_version: 1.0.0
+      enable_mcelog:
+        type: "checkbox"
+        weight: 20
+        value: true
+        label: "Enable collectd for mcelog"
+      enable_hugepages:
+        type: "checkbox"
+        weight: 20
+        value: true
+        label: "Enable collectd for hugepages"
+      enable_ovs_events:
+        type: "checkbox"
+        weight: 20
+        value: true
+        label: "Enable collectd for Open vSwitch events"
+    weight: 70
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
new file mode 100644
index 000000000..16f8a92e0
--- /dev/null
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
@@ -0,0 +1,160 @@
+##############################################################################
+# 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
+##############################################################################
+
+###############################################################################
+# Description:
+# This .yaml configuration file defines the configuration of the fuel
+# deployment and is passed as an argument to deploy.sh
+# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
+# This will make build.sh fetch this configuration file and configure the
+# deployment accordingly.
+# After the deployment, a copy of this file gets uploaded to fuel:
+# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
+# /root/deploy-config.sha1
+##############################################################################
+
+##############################################################################
+# deployment configuration meta-data
+deployment-scenario-metadata:
+   title: NFV KVM OVS-DPDK and Barometer HA deployment
+   version: 0.0.1
+   created: Feb 6 2016
+   comment: NFV KVM OVS-DPDK and Barometer
+
+##############################################################################
+# Stack extentions are opnfv added value features in form of a fuel-plugin
+# plug-ins listed below will be enabled and configured according to the
+# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
+# It does so by copying the config file to the local plugin config directory
+stack-extensions:
+   - module: fuel-plugin-kvm
+     module-config-name: fuel-nfvkvm
+     module-config-version: 1.0.0
+     module-config-override:
+       # Module config overrides
+
+stack-extensions:
+   - module: fuel-plugin-collectd-ceilometer
+     module-config-name: fuel-barometer
+     module-config-version: 1.0.0
+     module-config-override:
+       # Module config overrides
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+  fuel:
+    FEATURE_GROUPS:
+    - experimental
+  environment:
+    net_segment_type: vlan
+  nodes:
+  - id: 1
+    interfaces: interfaces_vlan
+    role: controller
+  - id: 2
+    interfaces: interfaces_vlan
+    role: mongo,controller
+  - id: 3
+    interfaces: interfaces_vlan
+    role: ceph-osd,controller
+  - id: 4
+    interfaces: interfaces_dpdk
+    role: ceph-osd,compute
+    attributes: attributes_1
+  - id: 5
+    interfaces: interfaces_dpdk
+    role: ceph-osd,compute
+    attributes: attributes_1
+
+  attributes_1:
+    hugepages:
+      dpdk:
+        value: 1024
+      nova:
+        value:
+          '2048': 1024
+
+  network:
+    networking_parameters:
+      segmentation_type: vlan
+      vlan_range:
+      - 1000
+      - 1030
+    networks:
+    - cidr: null
+      gateway: null
+      ip_ranges: []
+      meta:
+        configurable: false
+        map_priority: 2
+        name: private
+        neutron_vlan_range: true
+        notation: null
+        render_addr_mask: null
+        render_type: null
+        seg_type: vlan
+        use_gateway: false
+        vlan_start: null
+      name: private
+      vlan_start: null
+
+  settings:
+    editable:
+      storage:
+        ephemeral_ceph:
+          description: Configures Nova to store ephemeral volumes in RBD. This works
+            best if Ceph is enabled for volumes and images, too. Enables live migration
+            of all types of Ceph backed VMs (without this option, live migration will
+            only work with VMs launched from Cinder volumes).
+          label: Ceph RBD for ephemeral volumes (Nova)
+          type: checkbox
+          value: true
+          weight: 75
+        images_ceph:
+          description: Configures Glance to use the Ceph RBD backend to store images.
+            If enabled, this option will prevent Swift from installing.
+          label: Ceph RBD for images (Glance)
+          restrictions:
+          - settings:storage.images_vcenter.value == true: Only one Glance backend could
+              be selected.
+          type: checkbox
+          value: true
+          weight: 30
+
+dha-override-config:
+  nodes:
+  - id: 1
+    libvirtName: controller1
+    libvirtTemplate: templates/virtual_environment/vms/controller.xml
+  - id: 2
+    libvirtName: controller2
+    libvirtTemplate: templates/virtual_environment/vms/controller.xml
+  - id: 3
+    libvirtName: controller3
+    libvirtTemplate: templates/virtual_environment/vms/controller.xml
+  - id: 4
+    libvirtName: compute1
+    libvirtTemplate: templates/virtual_environment/vms/compute.xml
+  - id: 5
+    libvirtName: compute2
+    libvirtTemplate: templates/virtual_environment/vms/compute.xml
+  - id: 6
+    libvirtName: fuel-master
+    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
+    isFuel: yes
+    username: root
+    password: r00tme
+
+##############################################################################
+# The verification pipeline may populate the section below with arbitrary
+# testing information, which post deploy can be retreived from the fuel master:
+# /root/deploy-config.yaml
+test:
diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index a2fa19a4d..5bae71422 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -87,3 +87,6 @@ os-nosdn-kvm_ovs_dpdk-ha:
 
 os-nosdn-kvm_ovs_dpdk-noha:
   configfile: no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+
+os-nosdn-kvm_ovs_dpdk_bar-ha:
+  configfile: ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml