diff options
18 files changed, 1037 insertions, 49 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index ee27adb49..878278942 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -9,7 +9,7 @@ ############################################################################## # Add Fuel plugin build targets here -PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild +PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild export PLUGINS #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk index fc85c059e..e6538d5b4 100644 --- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk +++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk @@ -9,4 +9,4 @@ BGPVPN_BRANCH=master BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git" -BGPVPN_CHANGE=27c8f609472b74a9205d244e4d93378b5a9ebfae +BGPVPN_CHANGE=fa803b03e768925428a719c7b1825e7bf7bb9f11 diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index 36614a0ce..f2a47b7ad 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -11,6 +11,9 @@ TOP := $(shell pwd) ODL_BRANCH=brahmaputra-release ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" +export USE_JAVA8=true +export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb + .PHONY: all all: .odlbuild diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile index b4844b420..5e38b4c53 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile @@ -22,12 +22,12 @@ all: .ovsbuild .PHONY: clean clean: - @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs*.rpm fuel-plugin-ovs*.rpm + @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs-*.rpm fuel-plugin-ovs-*.rpm @rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt .PHONY: release release:.ovsbuild - @rm -f ../release/opnfv/fuel-plugin-ovs*.rpm + @rm -f ../release/opnfv/fuel-plugin-ovs-*.rpm @mkdir -p ../release/opnfv @cp fuel-plugin-ovs*.rpm ../release/opnfv/ cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE) diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile index 6bc5769a5..4ca5236a0 100644 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile @@ -22,18 +22,18 @@ all: .ovsnfvbuild .PHONY: clean clean: - @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv*.rpm fuel-plugin-ovsnfv*.rpm + @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv-*.rpm fuel-plugin-ovsnfv-*.rpm @rm -f $(BUILD_BASE)/gitinfo_ovsnfv-dpdk-plugin.txt gitinfo_ovsnfv-dpdk-plugin.txt .PHONY: release release:.ovsnfvbuild - @rm -f ../release/opnfv/fuel-plugin-ovsnfv*.rpm + @rm -f ../release/opnfv/fuel-plugin-ovsnfv-*.rpm @mkdir -p ../release/opnfv @cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/ cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE) .ovsnfvbuild: - @rm -rf fuel-plugin-ovsnfv + @rm -rf ovsnfv sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev sudo pip install fuel-plugin-builder git clone $(OVSNFV_DPDK_REPO) ovsnfv @@ -47,7 +47,7 @@ release:.ovsnfvbuild INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR) @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm . $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt - @rm -rf fuel-plugin-ovsnfv + @rm -rf ovsnfv @touch .ovsnfvbuild # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index bfaec74f1..540f7ebce 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -18,6 +18,11 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only" # local mirror can be found after four attempts, the default archive # is returned instead. +# Some Ubuntu mirrors seem less reliable for this type of mirroring - +# as they are discoved they can be added to the blacklist below in order +# for them not to be considered. +BLACKLIST="mirrors.se.eu.kernel.org" + return_url=0 while [ "$1" != "" ]; do @@ -30,13 +35,13 @@ while [ "$1" != "" ]; do shift done - cnt=0 while [ $cnt -lt 4 ] do for url in $(curl -s http://mirrors.ubuntu.com/mirrors.txt) do host=$(echo $url | cut -d'/' -f3) + echo ${BLACKLIST} | grep -q ${host} && continue if $RSYNC "${host}::ubuntu/." &> /dev/null then if ! $RSYNC "${host}::ubuntu/Archive-Update-in-Progress*" &> /dev/null diff --git a/deploy/README b/deploy/README index 5067e7045..697a9b393 100644 --- a/deploy/README +++ b/deploy/README @@ -33,30 +33,15 @@ you will have to modify them according to your needs - If wou wish to deploy OPNFV cloud environment on top of KVM/Libvirt virtualization use as example the following configuration files: - * SR1 configuration files - => templates/virtual_environment/conf/ha dea.yaml dha.yaml - * ARNO configuration files - - => templates/virtual_environment/old_conf/ha - dea.yaml - dha.yaml - - => templates/virtual_environment/old_conf/multinode - dea.yaml - dha.yaml - - - If you wish to deploy OPNFV cloud environment on hardware use as example the following configuration files: - * SR1 configuration files - - => templates/hardware_environment/conf/ericsson_montreal_lab/ha + => templates/hardware_environment/conf/ericsson_montreal_lab/pod1/ha dea.yaml dha.yaml @@ -69,25 +54,6 @@ you will have to modify them according to your needs dha.yaml - * ARNO configuration files - - => templates/hardware_environment/old_conf/ericsson_montreal_lab/ha - dea.yaml - dha.yaml - - => templates/hardware_environment/old_conf/ericsson_montreal_lab/multinode - dea.yaml - dha.yaml - - => templates/hardware_environment/old_conf/linux_foundation_lab/ha - dea.yaml - dha.yaml - - => templates/hardware_environment/old_conf/linux_foundation_lab/multinode - dea.yaml - dha.yaml - - --- Step.2 Run Autodeployment --- usage: python deploy.py [-h] [-nf] [-nh] [-fo] [-co] [-c] [-iso [ISO_FILE]] diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 63c8c1e53..42bab09bb 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -96,7 +96,7 @@ class Deployment(object): print(log_msg + '\n') def run_deploy(self): - WAIT_LOOP = 180 + WAIT_LOOP = 240 SLEEP_TIME = 60 LOG_FILE = 'cloud.log' diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml new file mode 100644 index 000000000..21bcdf170 --- /dev/null +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml @@ -0,0 +1,23 @@ +plugin-config-metadata: + title: BGPVPN fuel Plugin configuration template + version: 0.2 + created: Fri Feb 05 2016 + comment: None + +bgpvpn: + metadata: + class: plugin + default: false + enabled: false + label: BGPVPN plugin + toggleable: true + versions: + - metadata: + always_editable: false + enabled: true + label: BGPVPN plugin + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin + weight: 90 + weight: 70 diff --git a/deploy/config/plugins/fuel-nfvkvm_0.0.2.yaml b/deploy/config/plugins/fuel-nfvkvm_0.0.2.yaml new file mode 100644 index 000000000..842e1e10d --- /dev/null +++ b/deploy/config/plugins/fuel-nfvkvm_0.0.2.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 QEMU-KVM fuel Plugin configuration template + version: 0.2 + created: Tue Feb 9 2016 + comment: None + +fuel-plugin-qemu: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: fuel-plugin-qemu + toggleable: true + versions: + - metadata: + always_editable: false + #plugin_id: 1 Assigned during installation + plugin_version: 0.5.2 + use_kvm: + label: 'EXPERIMENTAL: KVM enhancements for NFV' + type: checkbox + value: true + weight: 20 + weight: 70 diff --git a/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml b/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml new file mode 100644 index 000000000..902938211 --- /dev/null +++ b/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml @@ -0,0 +1,35 @@ +############################################################################## +# 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 OVS fuel Plugin configuration template + version: 0.2 + created: Mon Feb 15 2016 + comment: Rebased for new plugin arch + +fuel-plugin-ovsnfv: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: Userspace OVS support + toggleable: true + versions: + - fuel-plugin-ovsnfv_text: + description: Specify compute node interface to which OVS-DPDK binds + label: NIC for DPDK + type: text + value: ens1f1 + weight: 25 + metadata: + always_editable: false + #plugin_id: Assigned during installation + plugin_version: 0.0.1 + weight: 70 diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml new file mode 100644 index 000000000..85098a5f6 --- /dev/null +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml @@ -0,0 +1,180 @@ +############################################################################## +# 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 HA deployment + version: 0.0.4 + created: Feb 9 2016 + comment: Rebased to Fuel8 and the new KVM QEMU plugin verssion + +############################################################################## +# 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-qemu + module-config-name: fuel-nfvkvm + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: compute + transformations: transformations_1 + + 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: false + 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: false + weight: 30 + images_vcenter: + description: Configures Glance to use the vCenter/ESXi backend to store images. If enabled, this option will prevent Swift from installing. + label: VMware vCenter/ESXi datastore for images (Glance) + restrictions: + - action: hide + condition: settings:common.use_vcenter.value != true + - condition: settings:storage.images_ceph.value == true + message: Only one Glance backend could be selected. + type: checkbox + value: false + weight: 35 + iser: + description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.' + label: iSER protocol for volumes (Cinder) + restrictions: + - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm' + - action: hide + condition: not ('experimental' in version:feature_groups) + type: checkbox + value: false + weight: 11 + metadata: + group: storage + label: Storage Backends + weight: 60 + objects_ceph: + description: Configures RadosGW front end for Ceph RBD. This exposes S3 and Swift API Interfaces. If enabled, this option will prevent Swift from installing. + label: Ceph RadosGW for objects (Swift API) + type: checkbox + value: false + weight: 80 + osd_pool_size: + description: Configures the default number of object replicas in Ceph. This number must be equal to or lower than the number of deployed 'Storage - Ceph OSD' nodes. + label: Ceph object replication factor + regex: + error: Invalid number + source: ^[1-9]\d*$ + type: text + value: '3' + weight: 85 + volumes_block_device: + description: High performance block device storage. It is recommended to have at least one Storage - Cinder Block Device + label: Cinder Block device driver + restrictions: + - settings:storage.volumes_ceph.value == true + type: checkbox + value: false + weight: 15 + volumes_ceph: + description: Configures Cinder to store volumes in Ceph RBD images. + label: Ceph RBD for volumes (Cinder) + restrictions: + - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value == true + type: checkbox + value: false + weight: 20 + volumes_lvm: + description: It is recommended to have at least one Storage - Cinder LVM node. + label: Cinder LVM over iSCSI for volumes + restrictions: + - settings:storage.volumes_ceph.value == true + type: checkbox + value: false + weight: 10 + +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/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml new file mode 100644 index 000000000..b6197efa5 --- /dev/null +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml @@ -0,0 +1,96 @@ +############################################################################## +# 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 OVS HA deployment + version: 0.0.4 + created: Feb 15 2016 + comment: Rebased to Fuel8 + +############################################################################## +# 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-ovsnfv + module-config-name: fuel-nfvovs + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 +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/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml new file mode 100644 index 000000000..0822bf413 --- /dev/null +++ b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml @@ -0,0 +1,241 @@ +############################################################################## +# 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: ODL-L2 HA BGPVPN deployment + version: 0.0.2 + created: 05.02.2016 + comment: Fuel ODL-L2 HA with Ceph, Ceilometer, Heat and BGPVPN + +############################################################################## +# 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: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.1 +# module-config-override: +# # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: false +# enable_sfc: +# value: false +# - module: bgpvpn +# module-config-name: fuel-bgpvpn +# module-config-version: 0.0.1 +# module-config-override: + + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + mode: ha + net_segment_type: tun + wanted_release: Liberty on Ubuntu 14.04 + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + bgpvpn: + class: plugin + default: false + enabled: true + label: BGPVPN plugin + toggleable: true + versions: + - metadata: + always_editable: false + enabled: true + label: BGPVPN plugin + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin + weight: 90 + weight: 70 + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: OpenDaylight plugin + toggleable: true + versions: + - enable_gbp: + label: GBP features + type: checkbox + value: false + weight: 14 + enable_l3_odl: + label: Use ODL to manage L3 traffic + restrictions: + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + type: checkbox + value: false + weight: 12 + enable_sfc: + label: SFC features + type: checkbox + value: false + weight: 13 + metadata: + always_editable: false + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + gbp: + - odl-groupbasedpolicy-base + - odl-groupbasedpolicy-ofoverlay + ovs: + - odl-ovsdb-openstack + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + sfc: + - odl-sfc-core + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + - odl-sfc-test-consumer + vpn: + - odl-vpnservice-api + - odl-vpnservice-impl + - odl-vpnservice-impl-rest + - odl-vpnservice-impl-ui + - odl-vpnservice-core + - odl-vpnservice-openstack + # plugin_id: Assigned during installation + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + rest_api_port: + description: Port on which ODL REST API will be available. + label: Port number + regex: + error: Invalid port number + source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ + type: text + value: '8282' + weight: 40 + weight: 70 + additional_components: + ceilometer: + description: If selected, Ceilometer component will be installed + label: Install Ceilometer + type: checkbox + value: true + weight: 40 + heat: + description: '' + label: '' + type: hidden + value: true + weight: 30 + metadata: + label: Additional Components + weight: 20 + 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/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..a3d6e0188 --- /dev/null +++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,155 @@ +############################################################################## +# 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 NO-HA deployment + version: 0.0.3 + created: Feb 9 2016 + comment: NFV KVM NO-HA Rebased for Fuel8 and the new qemu plugin version + +############################################################################## +# 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-qemu + module-config-name: fuel-nfvkvm + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: compute + transformations: transformations_1 + + 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: false + 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: false + weight: 30 + images_vcenter: + description: Configures Glance to use the vCenter/ESXi backend to store images. If enabled, this option will prevent Swift from installing. + label: VMware vCenter/ESXi datastore for images (Glance) + restrictions: + - action: hide + condition: settings:common.use_vcenter.value != true + - condition: settings:storage.images_ceph.value == true + message: Only one Glance backend could be selected. + type: checkbox + value: false + weight: 35 + iser: + description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.' + label: iSER protocol for volumes (Cinder) + restrictions: + - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm' + - action: hide + condition: not ('experimental' in version:feature_groups) + type: checkbox + value: false + weight: 11 + metadata: + group: storage + label: Storage Backends + weight: 60 + objects_ceph: + description: Configures RadosGW front end for Ceph RBD. This exposes S3 and Swift API Interfaces. If enabled, this option will prevent Swift from installing. + label: Ceph RadosGW for objects (Swift API) + type: checkbox + value: false + weight: 80 + osd_pool_size: + description: Configures the default number of object replicas in Ceph. This number must be equal to or lower than the number of deployed 'Storage - Ceph OSD' nodes. + label: Ceph object replication factor + regex: + error: Invalid number + source: ^[1-9]\d*$ + type: text + value: '3' + weight: 85 + volumes_block_device: + description: High performance block device storage. It is recommended to have at least one Storage - Cinder Block Device + label: Cinder Block device driver + restrictions: + - settings:storage.volumes_ceph.value == true + type: checkbox + value: false + weight: 15 + volumes_ceph: + description: Configures Cinder to store volumes in Ceph RBD images. + label: Ceph RBD for volumes (Cinder) + restrictions: + - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value == true + type: checkbox + value: false + weight: 20 + volumes_lvm: + description: It is recommended to have at least one Storage - Cinder LVM node. + label: Cinder LVM over iSCSI for volumes + restrictions: + - settings:storage.volumes_ceph.value == true + type: checkbox + value: false + weight: 10 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# 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/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml new file mode 100644 index 000000000..5a1c028f1 --- /dev/null +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml @@ -0,0 +1,72 @@ +############################################################################## +# 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 OVS NO-HA deployment + version: 0.0.3 + created: Feb 15 2016 + comment: NFV OVS NO-HA Rebased for Fuel8 + +############################################################################## +# 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-ovsnfv + module-config-name: fuel-nfvovs + module-config-version: 0.0.2 + module-config-override: + # Module config overrides + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# 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/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml new file mode 100644 index 000000000..391bda321 --- /dev/null +++ b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml @@ -0,0 +1,176 @@ +############################################################################## +# 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: ODL-L2 No-HA BGPVPN deployment + version: 0.0.2 + created: 05.02.2016 + comment: Fuel ODL-L2 No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8 + +############################################################################## +# 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: +# Note that the module substitionion does not support arrays +# This is a quick fix +# - module: opendaylight +# module-config-name: fuel-odl +# module-config-version: 0.0.2 +# module-config-override: +# # Module config overrides +# rest_api_port: +# value: '8282' +# enable_gbp: +# value: false +# enable_l3_odl: +# value: false +# enable_sfc: +# value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,opendaylight + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + bgpvpn: + metadata: + class: plugin + default: false + enabled: true + label: BGPVPN plugin + toggleable: true + versions: + - metadata: + always_editable: false + enabled: true + label: BGPVPN plugin + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin + weight: 90 + weight: 70 + opendaylight: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: OpenDaylight plugin + toggleable: true + versions: + - enable_gbp: + label: GBP features + type: checkbox + value: false + weight: 14 + enable_l3_odl: + label: Use ODL to manage L3 traffic + restrictions: + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + type: checkbox + value: false + weight: 12 + enable_sfc: + label: SFC features + type: checkbox + value: false + weight: 13 + metadata: + always_editable: false + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + gbp: + - odl-groupbasedpolicy-base + - odl-groupbasedpolicy-ofoverlay + ovs: + - odl-ovsdb-openstack + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + sfc: + - odl-sfc-core + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + - odl-sfc-test-consumer + vpn: + - odl-vpnservice-api + - odl-vpnservice-impl + - odl-vpnservice-impl-rest + - odl-vpnservice-impl-ui + - odl-vpnservice-core + - odl-vpnservice-openstack + # plugin_id: Assigned during installation + plugin_version: 0.8.0 + restrictions: + - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + rest_api_port: + description: Port on which ODL REST API will be available. + label: Port number + regex: + error: Invalid port number + source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ + type: text + value: '8282' + weight: 40 + weight: 70 + +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# 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 05b889c52..74a69fd66 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -57,18 +57,20 @@ os-onos-nofeature-noha: configfile: no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml os-nosdn-kvm-ha: - configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml + configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml os-nosdn-kvm-noha: - configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml + configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml os-nosdn-ovs-ha: - configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml + configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml os-nosdn-ovs-noha: - configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml + configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml os-odl_l2-bgpvpn-ha: + configfile: ha_odl-l2_bgpvpn_scenario_0.0.2.yaml os-odl_l2-bgpvpn-noha: + configfile: no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml |