diff options
26 files changed, 1680 insertions, 181 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..e6cf28033 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -11,6 +11,10 @@ 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 +export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz + .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/config/plugins/fuel-nshovs_0.0.1.yaml b/deploy/config/plugins/fuel-nshovs_0.0.1.yaml new file mode 100644 index 000000000..ec3ac38a9 --- /dev/null +++ b/deploy/config/plugins/fuel-nshovs_0.0.1.yaml @@ -0,0 +1,44 @@ +############################################################################## +# 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: NSHOVS fuel Plugin configuration template + version: 0.1 + created: Wed Feb 17 2016 + comment: None + +fuel-plugin-ovs: + metadata: + #chosen_id: Choosen at install time + class: plugin + default: false + enabled: true + label: Openvswitch with NSH support + toggleable: true + versions: + - dpdk-bind-nic: + label: Network device + type: text + value: eth2 + weight: 40 + metadata: + always_editable: false + #plugin_id: Choosen at install time + plugin_version: 0.5.2 + use_dpdk: + label: Use dpdk + type: checkbox + value: false + weight: 20 + use_dppd: + label: Use dppd + type: checkbox + value: false + weight: 20 + 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..0453b1f11 --- /dev/null +++ b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml @@ -0,0 +1,239 @@ +############################################################################## +# 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: + + 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: + 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 + 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/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml new file mode 100644 index 000000000..70b91e71e --- /dev/null +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml @@ -0,0 +1,188 @@ +############################################################################## +# 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 SFC HA deployment + version: 0.0.1 + created: Feb 10 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: nsh-ovs + module-config-name: fuel-nshovs + module-config-version: 0.0.1 + module-config-override: +# 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: 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: + 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: true + 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: true + weight: 13 + metadata: + always_editable: false + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + - odl-restconf-all + gbp: + - odl-groupbasedpolicy-neutronmapper + - odl-groupbasedpolicy-ofoverlay + ovs: + - odl-ovsdb-openstack + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + sfc: + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest. + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + 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: + 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/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml new file mode 100644 index 000000000..028aa15dd --- /dev/null +++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml @@ -0,0 +1,166 @@ +############################################################################## +# 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-SFC No-HA deployment + version: 0.0.1 + created: Feb 10 2016 + comment: Fuel ODL-L2 SFC No HA with 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: + - module: nsh-ovs + module-config-name: fuel-nshovs + module-config-version: 0.0.1 + module-config-override: + +# 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: + 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: true + 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: true + weight: 13 + metadata: + always_editable: false + odl_features: + default: + - config + - standard + - region + - package + - kar + - ssh + - management + - odl-restconf-all + gbp: + - odl-groupbasedpolicy-neutronmapper + - odl-groupbasedpolicy-ofoverlay + ovs: + - odl-ovsdb-openstack + - odl-restconf-all + - odl-aaa-authn + - odl-dlux-all + sfc: + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest. + - odl-sfc-sb-rest + - odl-sfc-ui + - odl-sfc-netconf + - odl-sfc-ovs + - odl-sfcofl2 + 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..f7d06510c 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -34,10 +34,6 @@ os-nosdn-nofeature-ha: os-nosdn-nofeature-noha: configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml -os-nosdn-vlan-ha: - -os-nosdn-vlan-noha: - os-odl_l3-nofeature-ha: configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml @@ -57,18 +53,25 @@ 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 + +os-odl_l2-sfc-ha: + configfile: ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml + +os-odl_l2-sfc-noha: + configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml diff --git a/docs/build-instruction.rst b/docs/build-instruction.rst index f280799fd..d5721af0b 100644 --- a/docs/build-instruction.rst +++ b/docs/build-instruction.rst @@ -1,25 +1,24 @@ -============================================================================ -OPNFV Build instruction for the Fuel deployment tool -============================================================================ +================================================================================================ +OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool +================================================================================================ .. contents:: Table of Contents :backlinks: none +License +======= + +This work is licensed under a Creative Commons Attribution 4.0 +International License. .. http://creativecommons.org/licenses/by/4.0 .. +(c) Jonas Bjurel (Ericsson AB) and others + Abstract ======== This document describes how to build the Fuel deployment tool for the -B release of OPNFV - the build system, dependencies and required +Brahmaputra release of OPNFV build system, dependencies and required system resources. - -License -======= -Brahmaputra release of OPNFV when using Fuel as a deployment tool DOCs (c) by Jonas Bjurel (Ericsson AB) and others. - -This document is licensed under a Creative Commons Attribution 4.0 International License. You should have received a copy of the license along with this. If not, see <http://creativecommons.org/licenses/by/4.0/>. - - Introduction ============ @@ -55,17 +54,17 @@ On the host, the following packages must be installed: - An x86_64 host (Bare-metal or VM) with Ubuntu 14.04 LTS installed - - A kernel equal or later than 3.19 (Vivid) (simply available through sudo apt-get install linux-generic-lts-vivid) + - A kernel equal- or later than 3.19 (Vivid) (simply available through sudo apt-get install linux-generic-lts-vivid) - **Note:** Builds on Wily (Ubuntu 15.x) are currently not supported -- docker - see https://docs.docker.com/engine/installation/ubuntulinux/ for installation notes for Ubuntu 14.04. Tested against ver 1.9.x and greater +- docker - see https://docs.docker.com/engine/installation/ubuntulinux/ for installation notes for Ubuntu 14.04. Tested against version 1.9.x and greater -- git (simply available through sudo apt-get install git) +- git (simply available through $ sudo apt-get install git) -- make (simply available through sudo apt-get install make) +- make (simply available through $ sudo apt-get install make) -- curl (simply available through sudo apt-get install curl) +- curl (simply available through $ sudo apt-get install curl) Preparations ============ @@ -74,17 +73,21 @@ Setting up the Docker build container ------------------------------------- After having installed Docker, add yourself to the docker group: -<sudo usermod -a -G docker [userid]> +$ sudo usermod -a -G docker [userid] + +Also make sure to define relevant DNS servers part of the global +DNS chain in your </etc/default/docker> configuration file. +Uncomment, and modify the values appropriately. -Also make sure to define relevant DNS servers part of the global dns chain in -in your </etc/default/docker> configuration file. Uncomment, modify the values appropriately -and save and quit the file. For example: +For example: <DOCKER_OPTS=" --dns=8.8.8.8 --dns=8.8.8.4"> Then restart docker: -<sudo service docker restart> +.. code-block:: console + +$ sudo service docker restart Setting up OPNFV Gerrit in order to being able to clone the code ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -102,20 +105,20 @@ Clone the OPNFV code Git repository with your SSH key ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Now it is time to clone the code repository: -<git clone ssh://'Linux foundation user'@gerrit.opnfv.org:29418/fuel> +$ git clone ssh://<Linux foundation user>@gerrit.opnfv.org:29418/fuel Now you should have the OPNFV fuel repository with the Fuel directories stored locally on your build host. Check out the Brahmaputra release: -<cd fuel> -<git checkout insert-b-release-tag-here0> +$ cd fuel +$ git checkout brahmaputra.1.0 Clone the OPNFV code Git repository without a SSH key ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can also opt to clone the code repository without a SSH key: -<git clone https://gerrit.opnfv.org:29418/gerrit/fuel> +$ git clone https://gerrit.opnfv.org:29418/gerrit/fuel Make sure to checkout the release tag as described above. @@ -168,9 +171,9 @@ Using a ssh proxy for the rsync connection If the proxy setup is not allowing the rsync protocol, an alternative solution is to use a SSH tunnel to a machine capable of accessing the outbound port 873. Set the RSYNC_CONNECT_PROG according to the rsync -manual page (for example to "ssh <username>@<hostname> nc %H 873") to enable -this. Also note that netcat needs to be installed on the remote -system! +manual page (for example to "ssh <username>@<hostname> nc %H 873") +to enable this. Also note that netcat needs to be installed on the +remote system! Make sure that the ssh command also refers to the user on the remote system, as the command itself will be run from the Docker build container @@ -196,9 +199,11 @@ cache will be on the ISO! Configure your build environment -------------------------------- -** Configuring the build environment should not be performed if building standard Brahmaputra release ** +** Configuring the build environment should not be performed if building +standard Brahmaputra release ** -Select the versions of the components you want to build by editing the fuel/build/config.mk file. +Select the versions of the components you want to build by editing the +fuel/build/config.mk file. Non official build: Selecting which plugins to build ---------------------------------------------------- @@ -211,7 +216,7 @@ Only the plugin targets from fuel/build/f_isoroot/Makefile that are specified in the environment variable will then be built. In order to completely disable the building of plugins, the environment variable is set to " ". When using this functionality, the resulting iso file -will be prepended with the prefix "unofficial-" to clearly indiciate +will be prepended with the prefix "unofficial-" to clearly indicate that this is not a full build. This method of plugin selection is not meant to be used from within @@ -236,13 +241,11 @@ Following targets exist: - none/all - this will: - - If not already existing, initialize the docker build environment + - Initialize the docker build environment - - If not already done, build OpenDaylight from upstream (as defined - by fuel-build config-spec) + - Build Fuel from upstream (as defined by fuel-build/config-spec) - - If not already done, build fuel from upstream (as defined by - fuel-build/config-spec) + - Build the OPNFV defined plugins/features from upstream - Build the defined additions to fuel (as defined by the structure of this framework) @@ -284,4 +287,8 @@ The artifacts produced are: References ========== -- +1) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +2) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +3) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst index f5ab62c26..ea08b6d31 100644 --- a/docs/configguide/installerconfig.rst +++ b/docs/configguide/installerconfig.rst @@ -6,12 +6,13 @@ Fuel configuration ================== -This section provides brief guidelines on how to install and +This section provides guidelines on how to install and configure the Brahmaputra release of OPNFV when using Fuel as a deployment tool including required software and hardware configurations. -For detailed instructions on how to install the Brahmaputra release using Fuel, see:<TODO> +For detailed instructions on how to install the Brahmaputra release using +Fuel, see *Reference 13* in section *"Fuel associated references"* below. Pre-configuration activities ---------------------------- @@ -25,12 +26,13 @@ done. Familiarize yourself with the Fuel by reading the following documents: -- Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html> +- Fuel planning guide, please see *Reference: 8* in section *"Fuel associated references"* below. -- Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html> +- Fuel user guide, please see *Reference: 9* in section *"Fuel associated references"* below. -- Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html> +- Fuel operations guide, please see *Reference: 10* in section *"Fuel associated references"* below. +- Fuel Plugin Developers Guide, please see *Reference: 11* in section *"Fuel associated references"* below. Before the installation can start, a number of deployment specific parameters must be collected, those are: @@ -54,12 +56,11 @@ Before the installation can start, a number of deployment specific parameters mu Retrieving the ISO image ^^^^^^^^^^^^^^^^^^^^^^^^ First of all, the Fuel deployment ISO image needs to be retrieved, the -.iso image of the Brahmaputra release of OPNFV when using Fuel as -a deployment tool can be found at: <TODO> +Fuel .iso image of the Brahmaputra release can be found at *Reference: 2* Alternatively, you may build the .iso from source by cloning the opnfv/fuel git repository. Detailed instructions on how to build -a Fuel OPNFV .iso can be found here: <TODO> +a Fuel OPNFV .iso can be found in *Reference: 14* at section *"Fuel associated references"* below. Hardware requirements --------------------- @@ -96,15 +97,15 @@ Following high level hardware requirements must be met: | | over other nics as your hardware supports | +--------------------+------------------------------------------------------+ -For a detailed hardware compatibility matrix - please see: -<https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list/> +For information on compatible hardware types available for use, please see +*Reference: 11* in section *"Fuel associated references"* below. Top of the rack (TOR) Configuration requirements ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The switching infrastructure provides connectivity for the OPNFV infrastructure operations, tenant networks (East/West) and provider connectivity (North/South); it also provides needed -connectivity for the storage Area Network (SAN). To avoid traffic +connectivity for the Storage Area Network (SAN). To avoid traffic congestion, it is strongly suggested that three physically separated networks are used, that is: 1 physical network for administration and control, one physical network for tenant private and public networks, @@ -118,9 +119,6 @@ the OPNFV reference platform. All the networks involved in the OPNFV infrastructure as well as the provider networks and the private tenant VLANs needs to be manually configured. -Manual configuration of the Brahmaputra hardware platform should -be carried out according to the OPNFV Pharos specification <TODO> - Jumphost configuration ---------------------- The Jumphost server, also known as the "Fuel master" provides needed @@ -134,8 +132,8 @@ and another for jump-host communication with the OPNFV cluster. Install the Fuel jump-host ^^^^^^^^^^^^^^^^^^^^^^^^^^ Mount the Fuel Brahmaputra ISO file as a boot device to the jump host -server, reboot it, and install the Fuel Jumphost in accordance with the -instructions found here: <TODO> +server, reboot it, and install the Fuel Jumphost in accordance with installation instructions, see *Reference 13* in section *"Fuel associated references"* +below. Platform components configuration @@ -218,7 +216,8 @@ developed by OPNFV: for compatibility information** The plugins come prepackaged, ready to install. To do so follow the -instructions provided here: <TODO> +installation instructions provided in *Reference 13* provided in section +*"Fuel associated references"* below. Fuel environment ^^^^^^^^^^^^^^^^ @@ -226,16 +225,17 @@ A Fuel environment is an OpenStack instance managed by Fuel, one Fuel instance can manage several OpenStack instances/environments with different configurations, etc. -To create a Fuel instance, follow the instructions provided -here: <TODO> +To create a Fuel instance, follow the instructions provided in the installation +instructions, see *Reference 13* in section *"Fuel associated references"* below. Provisioning of aditional features and services ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Although the plugins have already previously been installed, they are not per default enabled for the environment we just created. -The plugins of you choice need to be enabled and configured. +The plugins of your choice need to be enabled and configured. -To enable a plugin, follow the instructions in the installation instructions <TODO> +To enable a plugin, follow the installation instructions found in +*Reference 13*, provided in section *"Fuel associated references"* below. For configuration of the plugins, please refer to the corresponding feature in the ????? <TODO> @@ -252,7 +252,8 @@ All the networking aspects need to be configured in terms of: - etc. For guidelines on how to configure networking, please refer to the -installation instructions here: <TODO> +installation instructions found in *Reference 13* provided in section +*"Fuel associated references"* below. Node allocation ^^^^^^^^^^^^^^^ @@ -262,7 +263,7 @@ while others don't; Some roles may be co-located with other roles, while others may not. The Fuel GUI will guide you in the allocation of roles and will not permit you to perform invalid allocations. -For detailed guide-lines on node allocation, please refer to the installation instructions: <TODO> +For detailed guide-lines on node allocation, please refer to the installation instructions found in *Reference 13*, provided in section *"Fuel associated references"* below. Off-line deployment ^^^^^^^^^^^^^^^^^^^ @@ -271,11 +272,61 @@ repositories (default) or off-line using built-in local repositories on the Fuel jump-start server. For instructions on how to configure Fuel for off-line deployment, please -refer to the installation instructions: <TODO> +refer to the installation instructions found in, *Reference 13*, provided +in section *"Fuel associated references"* below. Deployment ^^^^^^^^^^ You should now be ready to deploy your OPNFV Brahmaputra environment - but before doing so you may want to verify your network settings. For further details on network verification and deployment, please refer to -the installation instructions: <TODO> +the installation instructions found in, *Reference 13*, provided in section +*"Fuel associated references"* below. + +Fuel associated references +-------------------------- + +OPNFV +~~~~~ + +1) `OPNFV Home Page <www.opnfv.org>`_ + +2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_ + +OpenStack +~~~~~~~~~ + +3) `OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_ + +4) `OpenStack documentation <http://docs.openstack.org>`_ + +OpenDaylight +~~~~~~~~~~~~ + +5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ + +Fuel +~~~~ + +6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_ + +7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_ + +8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_ + +9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_ + +10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_ + +11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ + +12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ + +Fuel in OPNFV +~~~~~~~~~~~~~ + +13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool diff --git a/docs/configguide/postinstall.rst b/docs/configguide/postinstall.rst index b5d28e992..e80d72aaf 100644 --- a/docs/configguide/postinstall.rst +++ b/docs/configguide/postinstall.rst @@ -14,9 +14,10 @@ These validate the installation in terms of configuration, services, networking, storage, policies, etc. The execution of the full range of health checks takes less than 30 minutes. -For instructions on how to run health-checks, please refer to the installation instructions: <TODO> +For instructions on how to run health-checks, please refer to the Fuel installation instructions. Platform components validation ------------------------------ Consult the feature sections in this document for any post-install feature specific validation/health-checks. + diff --git a/docs/installation-instruction.rst b/docs/installation-instruction.rst index eb02d7860..aaf96becb 100644 --- a/docs/installation-instruction.rst +++ b/docs/installation-instruction.rst @@ -5,22 +5,20 @@ OPNFV Installation instruction for the Brahmaputra release of OPNFV when using F .. contents:: Table of Contents :backlinks: none +License +======= + +This work is licensed under a Creative Commons Attribution 4.0 International +License. .. http://creativecommons.org/licenses/by/4.0 .. +(c) Jonas Bjurel (Ericsson AB) and others + Abstract ======== + This document describes how to install the Brahmaputra release of OPNFV when using Fuel as a deployment tool, covering it's usage, limitations, dependencies and required system resources. -License -======= -Brahmaputra release of OPNFV when using Fuel as a deployment tool -Docs (c) by Jonas Bjurel (Ericsson AB) - -This document is licensed under a Creative Commons Attribution 4.0 -International License. You should have received a copy of the license -along with this document. If not, see -<http://creativecommons.org/licenses/by/4.0/>. - Introduction ============ @@ -48,40 +46,39 @@ Retrieving the ISO image ------------------------ First of all, the Fuel deployment ISO image needs to be retrieved, the -Fuel .iso image of the Brahmaputra release can be found at <TODO> +Fuel .iso image of the Brahmaputra release can be found at *Reference: 2* Building the ISO image ---------------------- Alternatively, you may build the Fuel .iso from source by cloning the -opnfv/fuel git repository. To retrieve the repository for the Brahmaputra -release use the following command: +opnfv/fuel git repository. To retrieve the repository for the Brahmaputra release use the following command: $git clone https://<linux foundation uid>@gerrit.opnf.org/gerrit/fuel Check-out the Brahmaputra release tag to set the branch to the baseline required to replicate the Brahmaputra release: -$ git checkout stable/<TODO> +$ git checkout brahmaputra.1.0 Go to the fuel directory and build the .iso: $ cd fuel/build; make all -For more information on how to build, please see "OPNFV Build -instructions for - Brahmaputra release of OPNFV when using Fuel as -a deployment tool which you retrieved with the repository at -</fuel/fuel/docs/src/build-instructions.rst> <TODO> +For more information on how to build, please see *Reference: 14* + +Other preparations +------------------ Next, familiarize yourself with Fuel by reading the following documents: -- Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html> +- Fuel planning guide, please see *Reference: 8* -- Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html> +- Fuel user guide, please see *Reference: 9* -- Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html> +- Fuel operations guide, please see *Reference: 10* -- Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins> +- Fuel Plugin Developers Guide, please see *Reference: 11* Prior to installation, a number of deployment specific parameters must be collected, those are: @@ -148,9 +145,7 @@ Help with Hardware Requirements Calculate hardware requirements: -Refer to the OpenStack Hardware Compatibility List: -<https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list/> -for more information on various hardware types available for use. +For information on compatible hardware types available for use, please see *Reference: 11*. When choosing the hardware on which you will deploy your OpenStack environment, you should think about: @@ -170,7 +165,7 @@ Top of the rack (TOR) Configuration requirements The switching infrastructure provides connectivity for the OPNFV infrastructure operations, tenant networks (East/West) and provider connectivity (North/South); it also provides needed connectivity for -the storage Area Network (SAN). +the Storage Area Network (SAN). To avoid traffic congestion, it is strongly suggested that three physically separated networks are used, that is: 1 physical network for administration and control, one physical network for tenant private @@ -530,17 +525,15 @@ that can be used for installation / deployment of openstack. - Replace the URI values for the "Name" values outlined below: - - "ubuntu" URI="deb http://<ip-of-fuel-server>:8080/ubuntu-part trusty main" - - - "ubuntu-security" URI="deb http://<ip-of-fuel-server>:8080/ubuntu-part trusty main" + - "ubuntu" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty main" - - "ubuntu-updates" URI="deb http://<ip-of-fuel-server>:8080/ubuntu-part trusty main" + - "ubuntu-security" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-security main" - - "mos-updates" URI="deb http://<ip-of-fuel-server>:8080/mos-ubuntu mos8.0-updates main restricted" + - "ubuntu-updates" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-updates main" - - "mos-security" URI="deb http://<ip-of-fuel-server>:8080/mos-ubuntu mos8.0-security main restricted" + - "mos" URI="deb http://<ip-of-fuel-server>::8080/liberty-8.0/ubuntu/x86_64 mos8.0 main restricted" - - "mos-holdback" URI="deb http://<ip-of-fuel-server>:8080/mos-ubuntu mos8.0-holdback main restricted" + - "Auxiliary" URI="deb http://<ip-of-fuel-server>:8080/liberty-8.0/ubuntu/auxiliary auxiliary main restricted" - Click <Save Settings> at the bottom to Save your changes @@ -593,21 +586,44 @@ References OPNFV ----- -`OPNFV Home Page <www.opnfv.org>`_ +1) `OPNFV Home Page <www.opnfv.org>`_ + +2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_ OpenStack --------- -`OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_ +3) `OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_ -`OpenStack documentation <http://docs.openstack.org>`_ +4) `OpenStack documentation <http://docs.openstack.org>`_ OpenDaylight ------------ -`OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ +5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ Fuel ---- -`Fuel documentation <https://wiki.openstack.org/wiki/Fuel>`_ +6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_ + +7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_ + +8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_ + +9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_ + +10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_ + +11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ + +12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ + +Fuel in OPNFV +------------- + +13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 0ffa683cb..253859bfe 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -5,23 +5,18 @@ OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a dep .. contents:: Table of Contents :backlinks: none -Abstract -======== - -This document compiles the release notes for the Brahmaputra release of -OPNFV when using Fuel as a deployment tool. - License ======= -Brahmaputra release with the Fuel deployment tool Docs (c) by Jonas -Bjurel (Ericsson AB) +This work is licensed under a Creative Commons Attribution 4.0 International +License. .. http://creativecommons.org/licenses/by/4.0 .. +(c) Jonas Bjurel (Ericsson AB) and others -This document is licensed under a Creative Commons Attribution 4.0 -International License. +Abstract +======== -You should have received a copy of the license along with this document. -If not, see <http://creativecommons.org/licenses/by/4.0/>. +This document compiles the release notes for the Brahmaputra release of +OPNFV when using Fuel as a deployment tool. Important notes =============== @@ -33,7 +28,7 @@ The goal of the Brahmaputra release and this Fuel-based deployment process is to establish a lab ready platform accelerating further development of the OPNFV infrastructure. -Carefully follow the installation-instructions. +Carefully follow the installation-instructions provided in *Reference 13*. Summary ======= @@ -84,13 +79,13 @@ Release Data | **Project** | fuel | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | fuel/<TODO> | +| **Repo/tag** | brahmaputra.1.0 | | | | +--------------------------------------+--------------------------------------+ | **Release designation** | Brahmaputra base release | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | <TODO> | +| **Release date** | February 25 2016 | | | | +--------------------------------------+--------------------------------------+ | **Purpose of the delivery** | Brahmaputra base release | @@ -109,7 +104,7 @@ following upstream versions: - OpenStack Liberty release -- OpenDaylight Beryllium pre-release +- OpenDaylight Beryllium pre-release <TODO> - ONOS Drake release @@ -118,11 +113,11 @@ Document changes This is the third tracked version of the fuel installer for OPNFV. It comes with the following documentation: -- OPNFV Installation instructions for Brahmaputra with Fuel as deployment tool - **Changed** +- Installation instructions - *Reference 13* - **Changed** -- OPNFV Release Notes for Brahmaputra use of Fuel as deployment tool - **Changed** +- Build instructions - *Reference 14* - **Changed** -- OPNFV Build instructions for Brahmaputra with Fuel as deployment tool - **Changed** +- Release notes - *Reference 15* - **Changed** (This document) Reason for version ------------------ @@ -146,17 +141,16 @@ Deliverables Software deliverables ~~~~~~~~~~~~~~~~~~~~~ -Fuel-based installer iso file <TODO> +Fuel-based installer iso file found in *Reference 2* Documentation deliverables ~~~~~~~~~~~~~~~~~~~~~~~~~~ -- OPNFV Installation instructions for Brahmaputra release with the Fuel deployment tool +- Installation instructions - *Reference 13* -- OPNFV Build instructions for Brahmaputra release with the Fuel deployment - tool +- Build instructions - *Reference 14* -- OPNFV Release Note for Brahmaputra release with the Fuel deployment tool - (this document) +- Release notes - *Reference 15* (This document) Known Limitations, Issues and Workarounds ========================================= @@ -194,4 +188,48 @@ runs with the following results: References ========== For more information on the OPNFV Brahmaputra release, please see -<TODO> + +OPNFV +----- + +1) `OPNFV Home Page <www.opnfv.org>`_ + +2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_ + +OpenStack +--------- + +3) `OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_ + +4) `OpenStack documentation <http://docs.openstack.org>`_ + +OpenDaylight +------------ + +5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ + +Fuel +---- + +6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_ + +7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_ + +8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_ + +9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_ + +10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_ + +11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ + +12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ + +Fuel in OPNFV +------------- + +13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool + +15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool |