diff options
63 files changed, 821 insertions, 881 deletions
diff --git a/build/f_example_control_bond/Makefile b/build/f_example_control_bond/Makefile deleted file mode 100644 index 0949737bc..000000000 --- a/build/f_example_control_bond/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# 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 -############################################################################## - -TOP := $(shell pwd) - -.PHONY: all -all: - -.PHONY: clean -clean: - @rm -rf tmp - @rm -rf release - -.PHONY: validate-cache -validate-cache: - @echo "No cache validation schema available for $(shell pwd)" - @echo "Continuing ..." - -.PHONY: release -release: - @cp -Rvp puppet/modules/* $(PUPPET_DEST) diff --git a/build/f_example_control_bond/README b/build/f_example_control_bond/README deleted file mode 100644 index 4449b2ff2..000000000 --- a/build/f_example_control_bond/README +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# 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 -############################################################################## - -This is an example of a modification of the bridge and bonding of interfaces. -Rationale: Fuel currently don't support bonding of the "Admin" network, which -becomes a problem if you want to co-locate the single "Admin" and the redundant -bonded "Management" network on one and the same physical network in order to minimize -number of NICs, switches and cables. -This example show how you can modify the bridge and bonding settings and scripts to -achieve co-location. Of course the FUEL GUI becomes shorted in this respect, I.e. -the "admin" and "management" network cant be dragged across the NICs in the GUI. - -The f_example_control_bond has the following structure: -. -+--------+----------+-----------+ - | | | - puppet/ Makefile README - | (this file) - | - | - modules/ - | - | - | - opnfv/ - | - +--------------+ - | | - files/ manifests/ - | | - | | - | | - control-bond control-bond.pp - -Makefile: -Invoked by the git root Makefile, copies the files up to the release build -directory. - -control-bond: -The control-bond file is the .init file orchestrating the interface-, bridge- -and bond actions required for enabling the control bond - -control-bond.pp: -The control-bond.pp is the pupet manifest orchestrating the placement and -configuration of the control-bond shell script file. - -To activate this example feature, add "SUBDIRS += f_example_control_bond" in the git root Makefile. - - diff --git a/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond b/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond deleted file mode 100644 index bf2930d73..000000000 --- a/build/f_example_control_bond/puppet/modules/opnfv/files/control-bond +++ /dev/null @@ -1,90 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# 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 -############################################################################## - -#!/bin/sh -### BEGIN INIT INFO -# Provides: control-bond -# Required-Start: $remote_fs $all -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Bonds eth0 and eth1 and changes bridge configuration. -### END INIT INFO - - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -VSCTL=/usr/bin/ovs-vsctl -APPCTL=/usr/bin/ovs-appctl - - -add_control_bond() { - logger "Starting addition of control-bond" - $VSCTL --may-exist br-fw-admin - $VSCTL --may-exist br-mgmt - $VSCTL add-bond br-fw-admin bond-control eth0 eth1 - - $VSCTL set port br-mgmt tag=66 - $APPCTL bond/set-active-slave bond-control eth0 - - $VSCTL add-port br-fw-admin admin-to-mgmt - $VSCTL add-port br-mgmt mgmt-to-admin - $VSCTL set interface admin-to-mgmt type=patch - $VSCTL set interface mgmt-to-admin type=patch - - $VSCTL set interface admin-to-mgmt options:peer=mgmt-to-admin - $VSCTL set interface mgmt-to-admin options:peer=admin-to-mgmt - - $VSCTL set port admin-to-mgmt trunk=66 - $VSCTL set port mgmt-to-admin trunk=66 - logger "Finished addition of control-bond" -} - -status_control_bond() { - if [ ! -f $VSCTL ]; then - return 1 - else - $VSCTL show | grep -q "admin-to-mgmt" - return $? - fi -} - -case "$1" in - start) - status_control_bond - if [ $? -eq 0 ]; then - exit 0 - else - add_control_bond - fi - ;; - restart|reload|force-reload) - echo "Error: argument '$1' not supported" >&2 - exit 3 - ;; - status) - status_control_bond - if [ $? -eq 0 ]; then - echo "The control-bond is enabled" - exit 0 - else - echo "The control-bond is disabled" - exit 1 - fi - - ;; - stop) - echo "Stop is not supported" - exit 0 - ;; - *) - echo "Usage: $0 start|status" >&2 - exit 3 - ;; -esac diff --git a/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp b/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp deleted file mode 100644 index 22fe78171..000000000 --- a/build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# 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 -############################################################################## - -# Class: opnfv::control-bond -# -# Bridge control and management networks together using OVS. -# -# - -class opnfv::control-bond { - notify { '*** In Opnfv::control-bond-start ***': } - - file { "/etc/init.d/control-bond": - source => "puppet:///modules/opnfv/control-bond", - owner => 'root', - group => 'root', - mode => '0755', - notify => Service["control-bond"] - } - - - service { "control-bond": - ensure => running, - require => [ File["/etc/init.d/control-bond"], Service["openvswitch-service"] ], - } - - # Only start scripts - we don't want to bring down - # bridge during shutdown - - file { "/etc/rc2.d/S18control-bond": - ensure => 'link', - target => '/etc/init.d/control-bond', - } - - file { "/etc/rc3.d/S18control-bond": - ensure => 'link', - target => '/etc/init.d/control-bond', - } - - file { "/etc/rc4.d/S18control-bond": - ensure => 'link', - target => '/etc/init.d/control-bond', - } - - file { "/etc/rc5.d/S18control-bond": - ensure => 'link', - target => '/etc/init.d/control-bond', - } -} diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml index d6fea9269..1ba7201f4 100644 --- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml +++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml @@ -1,2 +1,9 @@ +############################################################################## +# Copyright (c) 2016 OPNFV. +# 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 +############################################################################## packages: - "collectd" diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk index 9fb2f9283..eaef3d414 100644 --- a/build/f_isoroot/f_kvm-pluginbuild/config.mk +++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -KVMFORNFV_BRANCH=b1c117f1c8414bddbe4370414590f5f0b62ae4d1 +KVMFORNFV_BRANCH=stable/colorado KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv -KVMFORNFV_CHANGE= +KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 7672b0037..466aba2ae 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -13,4 +13,4 @@ FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.gi export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz export ODL_VERSION_NUMBER?=0.4.3 -export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC2.tar.gz +export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC3.5.tar.gz diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk index a599ecc8c..8effbd26b 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVS_NSH_DPDK_BRANCH?=137748b828f03debe5ae1b40a4ee440b8f5e96f8 +OVS_NSH_DPDK_BRANCH?=074aadce66ef3cf322a00a3cff5c57deb84088b5 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs OVS_NSH_DPDK_CHANGE?= diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile deleted file mode 100644 index 9455389bf..000000000 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# jonas.bjurel@eicsson.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 -############################################################################## - -TOP := $(shell pwd) - -############################################################################ -# BEGIN of Include definitions -# -include config.mk -# -# END Include definitions -############################################################################# - -.PHONY: all -all: .ovsnfvbuild - -.PHONY: clean -clean: - @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 - @mkdir -p ../release/opnfv - @cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/ - cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE) - -.ovsnfvbuild: - @rm -rf ovsnfv - git clone $(OVSNFV_DPDK_REPO) ovsnfv - cd ovsnfv; \ - git checkout $(OVSNFV_DPDK_BRANCH); \ - if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ - git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \ - git checkout FETCH_HEAD; \ - fi - cd ovsnfv; \ - 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 ovsnfv - @touch .ovsnfvbuild - # Store artifact in cache straight away if caching is enabled - # (no .cacheid will be present unless this is a cached build) - test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 - -############################################################################# -# Cache operations - only used when building through ci/build.sh -############################################################################# - - -# Create a unique hash to be used for getting and putting cache, based on: -# - The SHA1 hash of the HEAD on the plugin repo's $(OVSNFV_DPDK_BRANCH) -# - The contents of this Makefile -.cacheid: - @if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ - $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE) > .cachedata; \ - else \ - $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_BRANCH) > .cachedata; \ - fi - @sha1sum Makefile | awk {'print $$1'} >> .cachedata - @sha1sum config.mk | awk {'print $$1'} >> .cachedata - @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata - @cat .cachedata | $(CACHETOOL) getid > .cacheid - -# Clean local data related to caching - called prior to ordinary build -.PHONY: clean-cache -clean-cache: clean - @rm -f .cachedata .cacheid - -# Try to download cache - called prior to ordinary build -.PHONY: get-cache -get-cache: .cacheid - @if $(CACHETOOL) check $(shell cat .cacheid); then \ - $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\ - else \ - echo "No cache item found for $(shell cat .cacheid)" ;\ - exit 0;\ - fi - -# Store cache if not already stored - called after ordinary build -.PHONY: put-cache -put-cache: .cacheid - @tar cf - .ovsnfvbuild fuel-plugin-ovsnfv*.rpm gitinfo_ovsnfv-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk deleted file mode 100644 index 1893fce4a..000000000 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# jonas.bjurel@eicsson.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 -############################################################################## - -OVSNFV_DPDK_BRANCH=stable/brahmaputra -OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git -OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv -OVSNFV_DPDK_CHANGE= diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml index d8fab974f..fcf4257f1 100644 --- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml +++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml @@ -1,3 +1,11 @@ +############################################################################## +# Copyright (c) 2015,2016 Ericsson AB and others. +# mskalski@mirantis.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- root_ssh_authorized_file: /root/.ssh/id_rsa.pub extend_kopts: "biosdevname=0 net.ifnames=1 debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8" diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index 7b134e73c..20b3485a1 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -8,24 +8,32 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# Try to choose close ubuntu mirror +# Try to choose close ubuntu mirror from mirrors.txt, but "whitewash" this +# against the full repo list to removed mirrors not up-to-date. # 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 mirror.its.dal.ca" +BLACKLIST="mirror.clibre.uqam.ca" -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 curl -s -o /dev/null --head --fail "$url"; then - echo $url - exit 0 - else - continue - fi -done +#NOTE: For now the mirror selection is disabled due to issues not yet +# understood/resolved. +#for url in $((curl -s https://launchpad.net/ubuntu/+archivemirrors | \ +# grep -P -B8 "statusUP|statusSIX" | \ +# grep -o -P "(f|ht)tp.*\"" | \ +# sed 's/"$//' | sort | uniq; \ +# curl -s http://mirrors.ubuntu.com/mirrors.txt | sort | uniq) | \ +# sort | uniq -d) +#do +# host=$(echo $url | cut -d'/' -f3) +# echo ${BLACKLIST} | grep -q ${host} && continue +# if curl -s -o /dev/null --head --fail "$url"; then +# echo $url +# exit 0 +# else +# continue +# fi +#done # If no suitable local mirror can be found, # the default archive is returned instead. diff --git a/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch new file mode 100644 index 000000000..4d5be493b --- /dev/null +++ b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch @@ -0,0 +1,44 @@ +From ba542dde34743b276547b7ca3c6591feb9000877 Mon Sep 17 00:00:00 2001 +From: iberezovskiy <iberezovskiy@mirantis.com> +Date: Mon, 19 Sep 2016 12:35:05 +0300 +Subject: [PATCH] Disable token revoke to increase keystone performance + +Change-Id: I4df816369093908ad1eac372f38c92155efbe8e0 +Closes-bug: #1625077 +--- + .../openstack_tasks/manifests/keystone/keystone.pp | 2 ++ + tests/noop/spec/hosts/keystone/keystone_spec.rb | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp +index 3162287..ba9d7df 100644 +--- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp ++++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp +@@ -327,6 +327,8 @@ class openstack_tasks::keystone::keystone { + memcache_pool_unused_timeout => '60', + cache_memcache_servers => $memcache_servers, + policy_driver => 'keystone.policy.backends.sql.Policy', ++ # Set revoke_by_id to false according to LP #1625077 ++ revoke_by_id => false, + } + + Package<| title == 'keystone'|> ~> Service<| title == 'keystone'|> +diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb +index b29e691..3c0f847 100644 +--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb ++++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb +@@ -176,6 +176,11 @@ describe manifest do + should contain_class('keystone').with('sync_db' => primary_controller) + end + ++ it 'should declare keystone class with revoke_by_id set to false' do ++ # Set revoke_by_id to false according to LP #1625077 ++ should contain_class('keystone').with('revoke_by_id' => false) ++ end ++ + it 'should configure keystone with paramters' do + should contain_keystone_config('token/caching').with(:value => 'false') + should contain_keystone_config('cache/enabled').with(:value => 'true') +-- +1.7.9.5 + diff --git a/build/patch-repos/build/repos/fuel-library/0001-Reduce-ceilometer-memory-usage.patch b/build/patch-repos/build/repos/fuel-library/0001-Reduce-ceilometer-memory-usage.patch new file mode 100644 index 000000000..f7fe06884 --- /dev/null +++ b/build/patch-repos/build/repos/fuel-library/0001-Reduce-ceilometer-memory-usage.patch @@ -0,0 +1,30 @@ +From 38315ee3945a5444de13918eb29e7771eb9927c7 Mon Sep 17 00:00:00 2001 +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Thu, 8 Sep 2016 19:25:14 +0300 +Subject: [PATCH 1/1] Reduce ceilometer memory usage + +Change-Id: I8b1a97bd710c859a3543d1aed8226313f35f4f10 +--- + .../manifests/ceilometer/controller.pp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp +index 2c63ff0..1dda109 100644 +--- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp ++++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp +@@ -234,5 +234,12 @@ class openstack_tasks::ceilometer::controller { + Ceilometer_config<| title == 'oslo_messaging_rabbit/kombu_compression' |> { value => $kombu_compression } + } + } ++ ++ # Reduce memory usage ++ ceilometer_config { ++ 'DEFAULT/executor_thread_pool_size': value => ceiling($service_workers*0.5); ++ 'notification/pipeline_processing_queues': value => ceiling($service_workers*1.5); ++ 'oslo_messaging_rabbit/rabbit_qos_prefetch_count': value => 5; ++ } + } + } +-- +1.7.9.5 + diff --git a/build/vagrant/README.rst b/build/vagrant/README.rst deleted file mode 100644 index 7db098dfa..000000000 --- a/build/vagrant/README.rst +++ /dev/null @@ -1,39 +0,0 @@ -================================= -Fuel@OPNFV Build Based on Vagrant -================================= - -License -======= - -This work is licensed under a Creative Commons Attribution 4.0 -International License. .. http://creativecommons.org/licenses/by/4.0 .. -(c) Ruijing Guo (Intel) and others - - -Abstract -======== - -This document describes how to build fuel iso based on vagrant. -The build is to follow fuel/docs/build-instruction.rst. - -Note -==== - -Vagrant based build is not official build. The target user is fuel@opnfv -developer. - -How to Build -============ - -run ./build_fuel.sh - - -Vagrantfile -=========== - -you can change memory & cpus to fit your enviorments. - -setup_fuel.sh -============= - -The script is run in VM and follow fuel/docs/build-instruction.rst. diff --git a/build/vagrant/Vagrantfile b/build/vagrant/Vagrantfile deleted file mode 100644 index 0fbadf2ae..000000000 --- a/build/vagrant/Vagrantfile +++ /dev/null @@ -1,23 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "trusty-server-cloudimg-amd64" - config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - - config.vm.define "fuel" do | h | - h.vm.host_name = "fuel" - h.vm.synced_folder "../..", "/fuel" - h.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 8192] - v.customize ["modifyvm", :id, "--cpus", 8] - file_to_disk = 'large_disk.vdi' - v.customize ['createhd', '--filename', file_to_disk, '--size', 512 * 1024] - v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk ] - end - end -end diff --git a/build/vagrant/build_fuel.sh b/build/vagrant/build_fuel.sh deleted file mode 100755 index 051ee4dfd..000000000 --- a/build/vagrant/build_fuel.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -sudo apt-get update -sudo apt-get install -y vagrant virtualbox -vagrant destroy -f; vagrant up -vagrant ssh -c "sudo apt-get update; sudo apt-get install -y linux-generic-lts-vivid" -vagrant reload -vagrant ssh -c "/vagrant/setup_fuel.sh" -vagrant ssh -c "cd fuel/build; make; cp fuel*.iso /vagrant" diff --git a/build/vagrant/setup_fuel.sh b/build/vagrant/setup_fuel.sh deleted file mode 100755 index b4d7651f9..000000000 --- a/build/vagrant/setup_fuel.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -sudo apt-get install -y git git-review make curl p7zip-full - -#install docker by https://docs.docker.com/engine/installation/linux/ubuntulinux/ -#sudo apt-get install linux-image-extra-$(uname -r) -sudo apt-get install -y apt-transport-https ca-certificates -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - -cat << EOF | sudo tee /etc/apt/sources.list.d/docker.list -deb https://apt.dockerproject.org/repo ubuntu-trusty main -EOF -sudo apt-get update -sudo apt-get purge lxc-docker -y - -#workaroud for large disk -sudo mkdir /var/lib/docker -yes | sudo mkfs.ext4 /dev/sdb -sudo mount /dev/sdb /var/lib/docker - -sudo apt-cache policy docker-engine -sudo apt-get install -y docker-engine -sudo service docker start -sudo groupadd docker -sudo usermod -aG docker vagrant -cp -r /fuel /home/vagrant diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index 20ecc1724..ea50307b1 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -45,9 +45,6 @@ class ConfigureNodes(object): exec_cmd('fuel node set --node-id %s --role %s --env %s' % (node_id, roles_blade[0], self.env_id)) - # Download the unmodified default deployment configuration, because we - # need it for the network config. - self.download_deployment_config() for node_id, roles_blade in self.node_id_roles_dict.iteritems(): # Modify node attributes self.download_attributes(node_id) @@ -56,13 +53,18 @@ class ConfigureNodes(object): # Modify interfaces configuration self.download_interface_config(node_id) self.modify_node_interface(node_id, roles_blade) - self.modify_node_network_schemes(node_id, roles_blade) self.upload_interface_config(node_id) + # Currently not used, we use default deployment facts + # which are generated by fuel based on type segmentation + # and network to nic assignment + # # Download our modified deployment configuration, which includes our # changes to network topology etc. - self.download_deployment_config() - self.upload_deployment_config() + #self.download_deployment_config() + #for node_id, roles_blade in self.node_id_roles_dict.iteritems(): + # self.modify_node_network_schemes(node_id, roles_blade) + #self.upload_deployment_config() def modify_node_network_schemes(self, node_id, roles_blade): log('Modify network transformations for node %s' % node_id) @@ -71,14 +73,14 @@ class ConfigureNodes(object): deployment_dir = '%s/deployment_%s' % ( self.yaml_config_dir, self.env_id) backup(deployment_dir) - for node_file in glob.glob(deployment_dir + '/*_%s.yaml' % node_id): - with io.open(node_file) as stream: - node = yaml.load(stream) + node_file = ('%s/%s.yaml' % (deployment_dir, node_id)) + with io.open(node_file) as stream: + node = yaml.load(stream) - node['network_scheme'].update(transformations) + node['network_scheme'].update(transformations) - with io.open(node_file, 'w') as stream: - yaml.dump(node, stream, default_flow_style=False) + with io.open(node_file, 'w') as stream: + yaml.dump(node, stream, default_flow_style=False) def download_deployment_config(self): log('Download deployment config for environment %s' % self.env_id) @@ -129,6 +131,22 @@ class ConfigureNodes(object): with open(attributes_yaml, 'w') as stream: yaml.dump(result_attributes, stream, default_flow_style=False) + # interface configuration can + # looks like this: + # + # interfaces_dpdk: + # ens3: + # - fuelweb_admin + # ens4: + # - storage + # - management + # ens5: + # - interface_properties: + # dpdk: + # enabled: true + # - private + # ens6: + # - public def modify_node_interface(self, node_id, roles_blade): log('Modify interface config for node %s' % node_id) interface_yaml = ('%s/node_%s/interfaces.yaml' @@ -150,11 +168,21 @@ class ConfigureNodes(object): for interface in interfaces: interface['assigned_networks'] = [] if interface['name'] in interface_config: - for net_name in interface_config[interface['name']]: + for prop in interface_config[interface['name']]: net = {} - net['id'] = net_name_id[net_name] - net['name'] = net_name - interface['assigned_networks'].append(net) + #net name + if isinstance(prop, six.string_types): + net['id'] = net_name_id[prop] + net['name'] = prop + interface['assigned_networks'].append(net) + #network properties + elif isinstance(prop, dict): + if not 'interface_properties' in prop: + log('Interface configuration contain unknow dict: %s' % prop) + continue + interface['interface_properties'] = \ + self._merge_dicts(interface.get('interface_properties', {}), + prop.get('interface_properties', {})) with io.open(interface_yaml, 'w') as stream: yaml.dump(interfaces, stream, default_flow_style=False) diff --git a/deploy/common.py b/deploy/common.py index 353045867..80832e201 100644 --- a/deploy/common.py +++ b/deploy/common.py @@ -18,6 +18,7 @@ import shutil import stat import errno import time +import shlex N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5, 'roles': 6, 'pending_roles': 7, 'online': 8, 'group_id': 9} @@ -41,7 +42,7 @@ os.chmod(LOGFILE, 0664) def mask_arguments(cmd, mask_args, mask_str): - cmd_line = cmd.split() + cmd_line = shlex.split(cmd) for pos in mask_args: # Don't mask the actual command; also check if we don't reference # beyond bounds diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 0b8485ba0..c1a0606bc 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -636,43 +636,25 @@ settings: section: main universe multiverse suite: trusty type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse suite: trusty-updates type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse suite: trusty-security type: deb - uri: http://archive.ubuntu.com/ubuntu/ + uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted suite: mos9.0 type: deb uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 - - name: mos-updates - priority: 1050 - section: main restricted - suite: mos9.0-updates - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - - name: mos-security - priority: 1050 - section: main restricted - suite: mos9.0-security - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - - name: mos-holdback - priority: 1100 - section: main restricted - suite: mos9.0-holdback - type: deb - uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ - name: Auxiliary priority: 1150 section: main restricted diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml index 985a2920c..32b2cfb22 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml index ad2f5ebde..0374c5d29 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version version: 0.0.3 diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml index ce3b62af9..cb80e3855 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml index 3c246c11c..c2352f924 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version version: 0.0.3 diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml index 736e9af3c..92cc0e616 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml @@ -25,42 +25,29 @@ interfaces_1: - private ens6: - public -transformations_1: - transformations: - - action: add-br - name: br-fw-admin - - action: add-br - name: br-mgmt - - action: add-br - name: br-storage - - action: add-br - name: br-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: ens3 - - action: add-port - bridge: br-mgmt - name: ens4 - - action: add-port - bridge: br-storage - name: ens3.102 - - action: add-port - bridge: br-mesh - name: ens5.103 - - action: add-port - bridge: br-ex - name: ens6 +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml index f2aeabd4c..d8f904362 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version version: 0.0.4 diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml new file mode 100644 index 000000000..ed7c63fac --- /dev/null +++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml @@ -0,0 +1,251 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## + +dea-pod-override-config-metadata: + title: 'Deployment Environment Adapter POD override for Development Pipeline - Intel Santa Clara, CA, USA version' + version: '0.1' + created: 'Wed Sept 7 2016' + comment: 'For Fuel 9' +environment: + name: opnfv_virt +interfaces_1: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public +interfaces_dpdk: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + - interface_properties: + dpdk: + enabled: true + ens6: + - public +interfaces_vlan: + ens3: + - fuelweb_admin + - storage + ens4: + - management + ens5: + - private + ens6: + - public +fuel: + ADMIN_NETWORK: + dhcp_pool_end: 10.20.0.254 + dhcp_pool_start: 10.20.0.3 + ipaddress: 10.20.0.2 + netmask: 255.255.255.0 + ssh_network: 10.20.0.0/24 + DNS_DOMAIN: domain.tld + DNS_SEARCH: domain.tld + DNS_UPSTREAM: 10.248.2.1 + HOSTNAME: fuel + NTP1: 10.20.0.1 + NTP2: null + NTP3: null +network: + networking_parameters: + base_mac: fa:16:3e:00:00:00 + configuration_template: null + dns_nameservers: + - 10.248.2.1 + floating_name: admin_floating_net + floating_ranges: + - - 172.16.0.130 + - 172.16.0.254 + gre_id_range: + - 2 + - 65535 + internal_cidr: 192.168.111.0/24 + internal_gateway: 192.168.111.1 + internal_name: admin_internal_net + net_l23_provider: ovs + segmentation_type: tun + vlan_range: + - 1000 + - 1030 + networks: + - cidr: 192.168.1.0/24 + gateway: null + ip_ranges: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.0/24 + configurable: true + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 102 + - cidr: 192.168.0.0/24 + gateway: null + ip_ranges: + - - 192.168.0.1 + - 192.168.0.253 + meta: + cidr: 192.168.0.0/24 + configurable: true + map_priority: 2 + name: management + notation: ip_ranges + render_addr_mask: internal + render_type: cidr + use_gateway: false + vips: + - haproxy + - vrouter + vlan_start: null + name: management + vlan_start: null + - cidr: 192.168.2.0/24 + gateway: null + ip_ranges: + - - 192.168.2.1 + - 192.168.2.254 + meta: + cidr: 192.168.2.0/24 + configurable: true + map_priority: 2 + name: private + notation: cidr + render_addr_mask: null + render_type: cidr + seg_type: tun + use_gateway: false + vlan_start: 103 + name: private + vlan_start: 103 + - cidr: 172.16.0.0/24 + gateway: 172.16.0.1 + ip_ranges: + - - 172.16.0.2 + - 172.16.0.126 + meta: + cidr: 172.16.0.0/24 + configurable: true + floating_range_var: floating_ranges + ip_range: + - 172.16.0.2 + - 172.16.0.126 + map_priority: 1 + name: public + notation: ip_ranges + render_addr_mask: public + render_type: null + use_gateway: true + vips: + - haproxy + - vrouter + vlan_start: null + name: public + vlan_start: null + - cidr: 10.20.0.0/24 + gateway: 10.20.0.2 + ip_ranges: + - - 10.20.0.3 + - 10.20.0.254 + meta: + configurable: false + map_priority: 0 + notation: ip_ranges + render_addr_mask: null + render_type: null + unmovable: true + use_gateway: true + name: fuelweb_admin + vlan_start: null +settings: + editable: + external_dns: + dns_list: + description: List of upstream DNS servers + label: DNS list + max: 3 + regex: + error: Invalid IP address + source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$ + type: text_list + value: + - 147.214.6.234 + weight: 10 + metadata: + group: network + label: Host OS DNS Servers + weight: 30 + external_ntp: + metadata: + group: network + label: Host OS NTP Servers + weight: 40 + ntp_list: + description: List of upstream NTP servers + label: NTP server list + regex: + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - 10.20.0.1 + weight: 10 + syslog: + metadata: + enabled: false + group: logging + label: Syslog + toggleable: true + weight: 50 + syslog_port: + description: Remote syslog port + label: Port + regex: + error: Invalid syslog port + 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: '514' + weight: 20 + syslog_server: + description: Remote syslog hostname + label: Hostname + regex: + error: Invalid hostname + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text + value: '' + weight: 10 + syslog_transport: + label: Syslog transport protocol + type: radio + value: tcp + values: + - data: udp + description: '' + label: UDP + - data: tcp + description: '' + label: TCP + weight: 30 + diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml new file mode 100644 index 000000000..837293950 --- /dev/null +++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml @@ -0,0 +1,110 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## +dha-pod-config-metadata: + title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Intel Santa Clara, CA. USA version + version: 0.0.1 + created: Sept 7 2016 + comment: Intel Santa Clara, CA, USA Fuel 9 version + +# Adapter to use for this definition +adapter: libvirt + +# Node list. +# Mandatory property is id, all other properties are adapter specific. + +nodes: +- id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml +- id: 2 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml +- id: 3 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml +- id: 4 + libvirtName: compute3 + libvirtTemplate: templates/virtual_environment/vms/compute.xml +- id: 5 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +virtNetConfDir: templates/virtual_environment/networks + +disks: + fuel: 100G + controller: 100G + compute: 100G + +# Here the infrastructure VMs can be defined. +# The entries are not mandatory! If it is left empty +# the default defined in deploy/templates will +# be used. +define_vms: + fuel: + vcpu: + value: 2 + memory: + attribute_equlas: + unit: KiB + value: 8388608 + currentMemory: + attribute_equlas: + unit: KiB + value: 8388608 + devices: + interface: + # With attribute_equlas someone can define which + # interface type is meant + attribute_equlas: + type: network + # This will overwrite the type of the model of + # the interface + model: + attribute: + type: virtio + controller: + vcpu: + value: 4 + memory: + attribute_equlas: + unit: KiB + value: 10485760 + currentMemory: + attribute_equlas: + unit: KiB + value: 10485760 + devices: + interface: + attribute_equlas: + type: network + model: + attribute: + type: e1000 + compute: + memory: + attribute_equlas: + unit: KiB + value: 6291456 + currentMemory: + attribute_equlas: + unit: KiB + value: 6291456 + devices: + interface: + attribute_equlas: + type: network + model: + attribute: + type: e1000 + diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml index 21bcdf170..f7ab89b37 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml @@ -1,3 +1,11 @@ +############################################################################## +# 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: BGPVPN fuel Plugin configuration template version: 0.2 diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml index adca822fc..aeea9e450 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml @@ -1,3 +1,11 @@ +############################################################################## +# 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: BGPVPN fuel Plugin configuration template version: 0.3 diff --git a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml index bbdefaf6e..1aa1259ca 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml @@ -1,3 +1,11 @@ +############################################################################## +# 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: BGPVPN fuel Plugin configuration template version: 0.9.0 diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index 436002d36..8896080db 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -137,7 +137,6 @@ def merge_networks(list_1, list_2): return [new_nets.get(net.get('name'), net) for net in list_1] - def merge_dicts(dict1, dict2): for k in set(dict1).union(dict2): if k in dict1 and k in dict2: diff --git a/deploy/dha_adapters/zte_adapter.py b/deploy/dha_adapters/zte_adapter.py index a40a02685..da651ca15 100644 --- a/deploy/dha_adapters/zte_adapter.py +++ b/deploy/dha_adapters/zte_adapter.py @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2015 Ericsson AB and others. +# Copyright (c) 2016 Ericsson AB, ZTE and others. # szilard.cserey@ericsson.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -24,27 +24,9 @@ class ZteAdapter(IpmiAdapter): super(ZteAdapter, self).__init__(yaml_path, attempts) def node_reset(self, node_id): - WAIT_LOOP = 600 log('RESET Node %s' % node_id) - cmd_prefix = self.ipmi_cmd(node_id) - state = exec_cmd('%s chassis power status' % cmd_prefix, mask_args=[8,10]) - if state == 'Chassis Power is on': - was_shut_off = False - done = False - exec_cmd('%s chassis power cycle' % cmd_prefix, mask_args=[8,10]) - for i in range(WAIT_LOOP): - state, _ = exec_cmd('%s chassis power status' % cmd_prefix, - check=False, - mask_args=[8,10]) - if state == 'Chassis Power is off': - was_shut_off = True - elif state == 'Chassis Power is on' and was_shut_off: - done = True - break - time.sleep(1) - if not done: - err('Could Not RESET Node %s' % node_id) - else: - err('Cannot RESET Node %s because it\'s not Active, state: %s' - % (node_id, state)) + cmd = '%s chassis power cycle' % self.ipmi_cmd(node_id) + exec_cmd(cmd, attempts=self.attempts, delay=self.delay, + verbose=True, + mask_args=[8,10]) diff --git a/deploy/reap.py b/deploy/reap.py index eb02fe25d..69c98d10c 100644 --- a/deploy/reap.py +++ b/deploy/reap.py @@ -18,6 +18,7 @@ import shutil import tempfile import re import netaddr +import templater from common import ( N, @@ -79,8 +80,6 @@ DHA_2 = ''' # which may not be correct - please adjust as needed. ''' -TEMPLATER = 'templater.py' - DISKS = {'fuel': '100G', 'controller': '100G', 'compute': '100G'} @@ -353,8 +352,10 @@ class Reap(object): self.download_config('network') def create_base_dea(self): - exec_cmd('python %s %s %s %s' - % (TEMPLATER, self.dea_file, self.template, self.base_dea)) + templater = templater.Templater(self.dea_file, + self.template, + self.base_dea) + templater.run() def finale(self): log('DEA file is available at %s' % self.dea_file) diff --git a/deploy/scenario/README b/deploy/scenario/README index 3472f6630..e32262d0d 100644 --- a/deploy/scenario/README +++ b/deploy/scenario/README @@ -93,23 +93,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,opendaylight - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 3 interfaces: interfaces_1 role: mongo,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: diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml index 8ab5f9277..4051c478a 100644 --- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml @@ -41,23 +41,18 @@ dea-override-config: - 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: diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml index 828569bb7..1217f7273 100644 --- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml @@ -46,23 +46,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,mongo - 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,ceph-osd - transformations: transformations_1 - id: 5 interfaces: interfaces_1 role: compute,ceph-osd - transformations: transformations_1 settings: editable: diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml index 6ececba6c..51deb4e28 100644 --- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -54,26 +54,21 @@ dea-override-config: net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: controller - transformations: transformations_vlan - id: 2 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: mongo,controller - transformations: transformations_vlan - id: 3 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: ceph-osd,controller - transformations: transformations_vlan - id: 4 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 5 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 attributes_1: @@ -82,7 +77,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml index 2257cbb70..7d52e77e2 100644 --- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml +++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml @@ -59,23 +59,18 @@ dea-override-config: - 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 dha-override-config: diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml index 0d16a3d65..90c89aedc 100644 --- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml @@ -60,23 +60,18 @@ dea-override-config: - 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 dha-override-config: nodes: diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index a900720f9..e6aef2aba 100644 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -76,23 +76,18 @@ dea-override-config: - 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 dha-override-config: nodes: - id: 1 diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml index e222582d2..0dda3b3ca 100644 --- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml @@ -66,23 +66,18 @@ dea-override-config: - 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: public_network_assignment: diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml index cb46af569..f813458d0 100644 --- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml @@ -67,23 +67,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,onos - 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: public_network_assignment: diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml index e9dd0e196..32fbfcf6c 100644 --- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -47,23 +47,18 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: controller,onos - 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: public_network_assignment: diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml index dc7868b56..d1d5191f0 100644 --- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml @@ -45,23 +45,18 @@ dea-override-config: - 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 settings: editable: diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml index c21585979..3dd5f841e 100644 --- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml @@ -41,19 +41,15 @@ dea-override-config: - 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: diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml index 779c6e14a..4661a263d 100644 --- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml @@ -48,19 +48,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd - 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: diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml index 56251215a..87364e83a 100644 --- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml @@ -55,19 +55,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 - id: 3 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 - id: 4 interfaces: interfaces_1 role: ceph-osd,compute - transformations: transformations_2 settings: editable: additional_components: diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml index f7b69a50f..7ab76cbcf 100644 --- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml @@ -54,23 +54,19 @@ dea-override-config: net_segment_type: vlan nodes: - id: 1 - interfaces: interfaces_dpdk + interfaces: interfaces_vlan role: mongo,controller - transformations: transformations_vlan - id: 2 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 3 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 - id: 4 interfaces: interfaces_dpdk role: ceph-osd,compute - transformations: transformations_dpdk attributes: attributes_1 attributes_1: @@ -79,7 +75,7 @@ dea-override-config: value: 128 nova: value: - '2048': 256 + '2048': 1024 network: networking_parameters: diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml index 08b46feca..6f21ea2c8 100644 --- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml +++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml @@ -60,19 +60,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - 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: diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml index e90f7e720..f8787d780 100644 --- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml @@ -61,19 +61,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - 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: diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml index 218378de3..a8d9ed848 100644 --- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -77,19 +77,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - 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: diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml index 7fa7829f2..5f800abad 100644 --- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml @@ -66,19 +66,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller - transformations: transformations_1 - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight - 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: public_network_assignment: diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml index c6f07a73c..f5c00f0c9 100644 --- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml @@ -68,19 +68,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,onos - 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: public_network_assignment: diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml index 80d73b335..587346ef4 100644 --- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -48,19 +48,15 @@ dea-override-config: - id: 1 interfaces: interfaces_1 role: mongo,controller,onos - 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: public_network_assignment: diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml index 5df530f42..567ea9867 100644 --- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml @@ -45,19 +45,15 @@ dea-override-config: - 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 settings: editable: additional_components: diff --git a/docs/buildprocedure/build.instruction.rst b/docs/buildprocedure/build.instruction.rst index 8ec8cb7b0..d755ee5fb 100644 --- a/docs/buildprocedure/build.instruction.rst +++ b/docs/buildprocedure/build.instruction.rst @@ -1,14 +1,10 @@ -============================================================================================== -OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool -============================================================================================== - -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 +.. This document is protected/licensed under the following conditions +.. (c) Jonas Bjurel (Ericsson AB) +.. Licensed under a Creative Commons Attribution 4.0 International License. +.. You should have received a copy of the license along with this work. +.. If not, see <http://creativecommons.org/licenses/by/4.0/>. +======== Abstract ======== @@ -16,6 +12,7 @@ This document describes how to build the Fuel deployment tool for the Colorado release of OPNFV build system, dependencies and required system resources. +============ Introduction ============ @@ -32,20 +29,21 @@ performed by the build system. The audience of this document is assumed to have good knowledge in network and Unix/Linux administration. +============ Requirements ============ Minimum Hardware Requirements ------------------------------ +============================= - ~30 GB available disc - 4 GB RAM Minimum Software Requirements ------------------------------ +============================= -The build host should run Ubuntu 14.04 operating system. +The build host should run Ubuntu 14.04 or 16.04 operating system. On the host, the following packages must be installed: @@ -68,11 +66,13 @@ On the host, the following packages must be installed: - curl (simply available through $ sudo apt-get install curl) +============ Preparations ============ Setting up the Docker build container -------------------------------------- +===================================== + After having installed Docker, add yourself to the docker group: .. code-block:: bash @@ -96,7 +96,8 @@ Then restart docker: $ sudo service docker restart Setting up OPNFV Gerrit in order to being able to clone the code -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------------------------------------------- + - Start setting up OPNFV gerrit by creating a SSH key (unless you don't already have one), create one with ssh-keygen @@ -108,7 +109,8 @@ Setting up OPNFV Gerrit in order to being able to clone the code your public key in. Clone the OPNFV code Git repository with your SSH key -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +----------------------------------------------------- + Now it is time to clone the code repository: .. code-block:: bash @@ -126,7 +128,8 @@ Check out the Colorado release: $ git checkout colorado.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: .. code-block:: bash @@ -136,17 +139,17 @@ You can also opt to clone the code repository without a SSH key: Make sure to checkout the release tag as described above. Support for building behind a http/https/rsync proxy ----------------------------------------------------- +==================================================== The build system is able to make use of a web proxy setup if the http_proxy, https_proxy, no_proxy (if needed) and RSYNC_PROXY or RSYNC_CONNECT_PROG environment variables have been set before invoking make. -The proxy setup must permit port 80 (http), 443 (https) and 873 -(rsync). +The proxy setup must permit port 80 (http) and 443 (https). +Rsync protocol is currently not used during build process. Important note about the host Docker daemon settings -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------------------------------- The Docker daemon on the host must be configured to use the http proxy for it to be able to pull the base Ubuntu 14.04 image from the Docker @@ -160,7 +163,7 @@ like: to /etc/default/docker and restarting the Docker daemon. Setting proxy environment variables prior to build -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------------------------------- The build system will make use the following environment variables that needs to be exported to subshells by using export (bash) or @@ -185,7 +188,7 @@ As an example, these are the settings that were put in the user's export no_proxy=localhost,127.0.0.1,.consultron.com,.sock 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 @@ -198,25 +201,8 @@ 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 as the root user (but with the invoking user's SSH keys). -Disabling the Ubuntu repo cache if rsync is not allowed -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -During the build phase, a local Ubuntu package repository is fetched -from upstream in order to be added to the OPNFV Fuel ISO and for parts -of this process rsync is used. - -If neither of the two available methods for proxying rsync are -available, the last resort is to turn off the caching of the Ubuntu -packages in the build system. This is done by removing the -"f_repobuild" from SUBDIRS in the beginning of -the fuel/build/f_isoroot/Makefile. - -Note! Doing this will require the Fuel master node to have Internet -access when installing the ISO artifact built as no Ubuntu package -cache will be on the ISO! - Configure your build environment --------------------------------- +================================ ** Configuring the build environment should not be performed if building standard Colorado release ** @@ -225,7 +211,8 @@ 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 ----------------------------------------------------- +==================================================== + In order to cut the build time for unofficial builds (made by an individual developer locally), the selection if which Fuel plugins to build (if any) can be done by environment variable @@ -241,6 +228,7 @@ that this is not a full build. This method of plugin selection is not meant to be used from within Gerrit! +======== Building ======== @@ -251,7 +239,8 @@ There are two methods available for building Fuel: - An abstracted method using build.sh Low level build method using make ---------------------------------- +================================= + The low level method is based on Make: From the <fuel/build> directory, invoke <make [target]> @@ -282,7 +271,8 @@ If the build is successful, you will find the generated ISO file in the <fuel/build/release> subdirectory! Abstracted build method using build.sh --------------------------------------- +====================================== + The abstracted build method uses the <fuel/ci/build.sh> script which allows you to: @@ -293,6 +283,7 @@ allows you to: For more info type <fuel/ci/build.sh -h>. +========= Artifacts ========= @@ -303,6 +294,7 @@ The artifacts produced are: - <OPNFV_XXXX.iso.txt> - Which holds version metadata. +========== References ========== diff --git a/docs/buildprocedure/index.rst b/docs/buildprocedure/index.rst index d2a7512af..4f88814b5 100644 --- a/docs/buildprocedure/index.rst +++ b/docs/buildprocedure/index.rst @@ -4,9 +4,9 @@ .. You should have received a copy of the license along with this work. .. If not, see <http://creativecommons.org/licenses/by/4.0/>. -****************************** -Fuel\@OPNFV build instructions -****************************** +********************************* +Build instruction for Fuel\@OPNFV +********************************* .. toctree:: :numbered: diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst index 171647188..8e61be219 100644 --- a/docs/installationprocedure/index.rst +++ b/docs/installationprocedure/index.rst @@ -4,9 +4,9 @@ .. You should have received a copy of the license along with this work. .. If not, see <http://creativecommons.org/licenses/by/4.0/>. -************************************ -Fuel\@OPNFV Installation Instruction -************************************ +**************************************** +Installation instruction for Fuel\@OPNFV +**************************************** .. toctree:: :numbered: diff --git a/docs/installationprocedure/installation.instruction.rst b/docs/installationprocedure/installation.instruction.rst index bb56a53cf..715159910 100644 --- a/docs/installationprocedure/installation.instruction.rst +++ b/docs/installationprocedure/installation.instruction.rst @@ -1,21 +1,18 @@ -======================================================================================================== -OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool -======================================================================================================== - -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 +.. This document is protected/licensed under the following conditions +.. (c) Jonas Bjurel (Ericsson AB) +.. Licensed under a Creative Commons Attribution 4.0 International License. +.. You should have received a copy of the license along with this work. +.. If not, see <http://creativecommons.org/licenses/by/4.0/>. +======== Abstract ======== This document describes how to install the Colorado release of -OPNFV when using Fuel as a deployment tool, covering it's usage, +OPNFV when using Fuel as a deployment tool, covering its usage, limitations, dependencies and required system resources. +============ Introduction ============ @@ -33,6 +30,7 @@ deployment. The audience of this document is assumed to have good knowledge in networking and Unix/Linux administration. +======= Preface ======= @@ -41,13 +39,13 @@ OPNFV, using Fuel as a deployment tool, some planning must be done. Retrieving the ISO image ------------------------- +======================== First of all, the Fuel deployment ISO image needs to be retrieved, the Fuel .iso image of the Colorado 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 Colorado @@ -73,7 +71,7 @@ Go to the fuel directory and build the .iso: For more information on how to build, please see *Reference: 14* Other preparations ------------------- +================== Next, familiarize yourself with Fuel by reading the following documents: @@ -107,6 +105,7 @@ Prior to installation, a number of deployment specific parameters must be collec This information will be needed for the configuration procedures provided in this document. +===================== Hardware requirements ===================== @@ -145,6 +144,7 @@ installation of Colorado using Fuel: | | supports. | +--------------------+------------------------------------------------------+ +=============================== Help with Hardware Requirements =============================== @@ -163,7 +163,7 @@ environment, you should think about: - Networking -- Depends on the Choose Network Topology, the network bandwidth per virtual machine, and network storage. - +================================================ Top of the rack (TOR) Configuration requirements ================================================ @@ -188,6 +188,7 @@ Manual configuration of the Colorado hardware platform should be carried out according to the OPNFV Pharos specification: <https://wiki.opnfv.org/pharos/pharos_specification> +========================================== OPNFV Software installation and deployment ========================================== @@ -196,7 +197,8 @@ server (Fuel master) as well as the deployment of the full OPNFV reference platform stack across a server cluster. Install Fuel master -------------------- +=================== + #. Mount the Colorado Fuel ISO file/media as a boot device to the jump host server. #. Reboot the jump host to establish the Fuel server. @@ -278,9 +280,8 @@ Install Fuel master - The installation will now start, wait until the login screen is shown. - Boot the Node Servers ---------------------- +===================== After the Fuel Master node has rebooted from the above steps and is at the login prompt, you should boot the Node Servers (Your @@ -301,9 +302,8 @@ scheme so that the FUEL Master can pick them up for control. .. figure:: img/nodes.png - Install additional Plugins/Features on the FUEL node ----------------------------------------------------- +==================================================== #. SSH to your FUEL node (e.g. root@10.20.0.2 pwd: r00tme) @@ -324,7 +324,7 @@ Install additional Plugins/Features on the FUEL node .. figure:: img/plugin_install.png Create an OpenStack Environment -------------------------------- +=============================== #. Connect to Fuel WEB UI with a browser (default: https://10.20.0.2:8443) (login: admin/admin) @@ -359,7 +359,7 @@ Create an OpenStack Environment - Click <Create> Button Configure the network environment ---------------------------------- +================================= #. Open the environment you previously created. @@ -458,7 +458,7 @@ Configure the network environment - Provide the NTP server settings Select Hypervisor type ----------------------- +====================== #. In the FUEL UI of your Environment, click the "Settings" Tab @@ -469,7 +469,7 @@ Select Hypervisor type .. figure:: img/compute.png Enable Plugins --------------- +============== #. In the FUEL UI of your Environment, click the "Settings" Tab @@ -480,7 +480,7 @@ Enable Plugins .. figure:: img/plugins.png Allocate nodes to environment and assign functional roles ---------------------------------------------------------- +========================================================= #. Click on the "Nodes" Tab in the FUEL WEB UI (see figure below). @@ -526,9 +526,8 @@ Allocate nodes to environment and assign functional roles .. figure:: img/interfaceconf.png - OPTIONAL - Set Local Mirror Repos ---------------------------------- +================================= The following steps must be executed if you are in an environment with no connection to the Internet. The Fuel server delivers a local repo @@ -538,11 +537,11 @@ 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/mirrors/ubuntu/ trusty main" + - "ubuntu" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty main universe multiverse" - - "ubuntu-security" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-security main" + - "ubuntu-security" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-security main universe multiverse" - - "ubuntu-updates" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-updates main" + - "ubuntu-updates" URI="deb http://<ip-of-fuel-server>:8080/mirrors/ubuntu/ trusty-updates main universe multiverse" - "mos" URI="deb http://<ip-of-fuel-server>::8080/mitaka-9.0/ubuntu/x86_64 mos9.0 main restricted" @@ -551,7 +550,7 @@ that can be used for installation / deployment of openstack. - Click <Save Settings> at the bottom to Save your changes Target specific configuration ------------------------------ +============================= #. Set up targets for provisioning with non-default "Offloading Modes" @@ -600,7 +599,7 @@ Target specific configuration - Repeat the step above for all affected nodes/interfaces in the POD. Verify Networks ---------------- +=============== It is important that the Verify Networks action is performed as it will verify that communicate works for the networks you have setup, as well as check that @@ -614,9 +613,8 @@ packages needed for a successful deployment can be fetched. .. figure:: img/verifynet.png - Deploy Your Environment ------------------------ +======================= #. Deploy the environment. @@ -629,6 +627,7 @@ Deploy Your Environment Wait for your deployment to complete, you can view the "Dashboard" Tab to see the progress and status of your deployment. +========================= Installation health-check ========================= @@ -642,30 +641,32 @@ Installation health-check .. figure:: img/health.png +========== References ========== OPNFV ------ +===== 1) `OPNFV Home Page <http://www.opnfv.org>`_: http://www.opnfv.org 2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_: https://www.opnfv.org/software/download OpenStack ---------- +========= 3) `OpenStack Mitaka Release artifacts <http://www.openstack.org/software/mitaka>`_: http://www.openstack.org/software/mitaka 4) `OpenStack documentation <http://docs.openstack.org>`_: http://docs.openstack.org OpenDaylight ------------- +============ 5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_: http://www.opendaylight.org/software/downloads Fuel ----- +==== + 6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_: https://wiki.openstack.org/wiki/Fuel 7) `Fuel documentation overview <http://docs.openstack.org/developer/fuel-docs>`_: http://docs.openstack.org/developer/fuel-docs @@ -681,7 +682,7 @@ Fuel 12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_: https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list Fuel in OPNFV -------------- +============= 13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst index 8fb1fef78..db97a7492 100644 --- a/docs/releasenotes/index.rst +++ b/docs/releasenotes/index.rst @@ -4,9 +4,9 @@ .. You should have received a copy of the license along with this work. .. If not, see <http://creativecommons.org/licenses/by/4.0/>. -************************* -Fuel\@OPNFV release notes -************************* +***************************** +Release notes for Fuel\@OPNFV +***************************** .. toctree:: :numbered: diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 427f0a9db..a748e41f9 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -1,20 +1,17 @@ -============================================================================================ -OPNFV Release Note for the Colorado 1.0 release of OPNFV when using Fuel as a deployment tool -============================================================================================ - -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 +.. This document is protected/licensed under the following conditions +.. (c) Jonas Bjurel (Ericsson AB) +.. Licensed under a Creative Commons Attribution 4.0 International License. +.. You should have received a copy of the license along with this work. +.. If not, see <http://creativecommons.org/licenses/by/4.0/>. +======== Abstract ======== This document compiles the release notes for the Colorado 1.0 release of OPNFV when using Fuel as a deployment tool. +=============== Important notes =============== @@ -27,25 +24,32 @@ of the OPNFV infrastructure. Carefully follow the installation-instructions provided in *Reference 13*. +======= Summary ======= For Colorado, the typical use of Fuel as an OpenStack installer is supplemented with OPNFV unique components such as: -- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Berylium SR3" +- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Beryllium SR3" [1]_ 'http://www.opendaylight.org/software' + +- `ONOS <http://onosproject.org/>`_ version "Drake" 'http://onosproject.org/' + +- `Service function chaining <https://wiki.opnfv.org/service_function_chaining>`_ 'https://wiki.opnfv.org/service_function_chaining' + +- `SDN distributed routing and VPN <https://wiki.opnfv.org/sdnvpn>`_ 'https://wiki.opnfv.org/sdnvpn' -- `ONOS <http://onosproject.org/>`_ version "Drake" +- `NFV Hypervisors-KVM <https://wiki.opnfv.org/nfv-kvm>`_ 'https://wiki.opnfv.org/nfv-kvm' -- `Service function chaining <https://wiki.opnfv.org/service_function_chaining>`_ +- `Open vSwitch for NFV <https://wiki.opnfv.org/ovsnfv>`_ 'https://wiki.opnfv.org/ovsnfv' -- `SDN distributed routing and VPN <https://wiki.opnfv.org/sdnvpn>`_ +- `VSPERF <https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases>`_ 'https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases' -- `NFV Hypervisors-KVM <https://wiki.opnfv.org/nfv-kvm>`_ +- `Promise <https://wiki.opnfv.org/display/promise>`_ 'https://wiki.opnfv.org/display/promise' -- `Open vSwitch for NFV <https://wiki.opnfv.org/ovsnfv>`_ +- `Parser <https://wiki.opnfv.org/display/parser>`_ 'https://wiki.opnfv.org/display/parser' -- `VSPERF <https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases>`_ +- `Doctor <https://wiki.opnfv.org/display/doctor>`_ 'https://wiki.opnfv.org/display/doctor' As well as OPNFV-unique configurations of the Hardware- and Software stack. @@ -68,6 +72,7 @@ OPNFV CI pipeline including: - Automated validation of the Colorado deployment +============ Release Data ============ @@ -78,43 +83,48 @@ Release Data | **Repo/tag** | colorado.1.0 | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | Colorado 1.0 follow-up release | +| **Release designation** | Colorado 1.0 main release | | | | +--------------------------------------+--------------------------------------+ | **Release date** | September 22 2016 | | | | +--------------------------------------+--------------------------------------+ | **Purpose of the delivery** | Colorado alignment to Released | -| | Fuel 9.0 baseline + Bug-fixes for | -| | the following feaures/scenarios: | +| | Fuel 9.0 baseline + features and | +| | bug-fixes for the following | +| | feaures: | | | - NFV Hypervisors-KVM | | | - Open vSwitch for NFV | -| | - OpenDaylight SR3 | +| | - OpenDaylight | +| | - ONOS | | | - SDN distributed routing and VPN | | | - Service function chaining | +| | - Promise | +| | - Parser | +| | - Doctor | | | | +--------------------------------------+--------------------------------------+ Version change --------------- +============== Module version changes -~~~~~~~~~~~~~~~~~~~~~~ -This is a follow-up release to Colorado 1.0. It is based on -following upstream versions: +---------------------- +This is the Colorado 1.0 main release. +It is based on following upstream versions: - Fuel 9.0 Base release - OpenStack Mitaka release -- OpenDaylight Beryllium SR3 release +- OpenDaylight Beryllium SR3 release [1]_ - ONOS Drake release Document changes -~~~~~~~~~~~~~~~~ -This is a follow-up release to Colorado 1.0. It -comes with the following documentation: +---------------- +This is the Colorado 1.0 main release. +It comes with the following documentation: - Installation instructions - *Reference 13* - **Changed** @@ -123,34 +133,33 @@ comes with the following documentation: - Release notes - *Reference 15* - **Changed** (This document) Reason for version ------------------- +================== Feature additions -~~~~~~~~~~~~~~~~~ +----------------- **JIRA TICKETS:** -- Bug corrections -~~~~~~~~~~~~~~~ +--------------- **JIRA TICKETS:** -`Workarounds <https://jira.opnfv.org/issues/?filter=11121>`_ 'https://jira.opnfv.org/issues/?filter=11121' +`Colorado 1.0 bug fixes <https://jira.opnfv.org/issues/?filter=11180>`_ 'https://jira.opnfv.org/issues/?filter=11180' (Also See respective Integrated feature project's bug tracking) Deliverables ------------- +============ Software deliverables -~~~~~~~~~~~~~~~~~~~~~ +--------------------- Fuel-based installer iso file found in *Reference 2* Documentation deliverables -~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------- - Installation instructions - *Reference 13* @@ -158,11 +167,12 @@ Documentation deliverables - Release notes - *Reference 15* (This document) +========================================= Known Limitations, Issues and Workarounds ========================================= System Limitations ------------------- +================== - **Max number of blades:** 1 Fuel master, 3 Controllers, 20 Compute blades @@ -174,73 +184,77 @@ System Limitations Known issues ------------- +============ **JIRA TICKETS:** -`Known issues <https://jira.opnfv.org/issues/?filter=11119>`_ 'https://jira.opnfv.org/issues/?filter=11119' +`Known issues <https://jira.opnfv.org/issues/?filter=11183>`_ 'https://jira.opnfv.org/issues/?filter=11183' (Also See respective Integrated feature project's bug tracking) Workarounds ------------ +=========== **JIRA TICKETS:** -`Workarounds <https://jira.opnfv.org/issues/?filter=11120>`_ 'https://jira.opnfv.org/issues/?filter=11120' +`Workarounds <https://jira.opnfv.org/issues/?filter=11181>`_ 'https://jira.opnfv.org/issues/?filter=11181' (Also See respective Integrated feature project's bug tracking) +============ Test results ============ The Colorado 1.0 release with the Fuel deployment tool has undergone QA test runs, see separate test results. +========== References ========== For more information on the OPNFV Colorado release, please see: OPNFV ------ +===== -1) `OPNFV Home Page <http://www.opnfv.org>`_ +1) `OPNFV Home Page <http://www.opnfv.org>`_ 'http://www.opnfv.org' -2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_ +2) `OPNFV documentation- and software downloads <https://www.opnfv.org/software/download>`_ 'https://www.opnfv.org/software/download' OpenStack ---------- +========= -3) `OpenStack Mitaka Release artifacts <http://www.openstack.org/software/mitaka>`_ +3) `OpenStack Mitaka Release artifacts <http://www.openstack.org/software/mitaka>`_ 'http://www.openstack.org/software/mitaka' -4) `OpenStack documentation <http://docs.openstack.org>`_ +4) `OpenStack documentation <http://docs.openstack.org>`_ 'http://docs.openstack.org' OpenDaylight ------------- +============ -5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ +5) `OpenDaylight artifacts <http://www.opendaylight.org/software/downloads>`_ 'http://www.opendaylight.org/software/downloads' Fuel ----- +==== -6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_ +6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_ 'https://wiki.openstack.org/wiki/Fuel' -7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/>`_ +7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/>`_ 'https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/' -8) `Fuel planning guide <https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/mos-planning-guide.html>`_ +8) `Fuel planning guide <https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/mos-planning-guide.html>`_ 'https://docs.fuel-infra.org/openstack/fuel/fuel-9.0/mos-planning-guide.html' -9) `Fuel quick start guide <https://docs.mirantis.com/openstack/fuel/fuel-9.0/quickstart-guide.html>`_ +9) `Fuel quick start guide <https://docs.mirantis.com/openstack/fuel/fuel-9.0/quickstart-guide.html>`_ 'https://docs.mirantis.com/openstack/fuel/fuel-9.0/quickstart-guide.html' -10) `Fuel reference architecture <https://docs.mirantis.com/openstack/fuel/fuel-9.0/reference-architecture.html>`_ +10) `Fuel reference architecture <https://docs.mirantis.com/openstack/fuel/fuel-9.0/reference-architecture.html>`_ 'https://docs.mirantis.com/openstack/fuel/fuel-9.0/reference-architecture.html' -11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ +11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ '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>`_ +12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ 'https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list' Fuel in OPNFV -------------- +============= + +13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installation-instruction.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/installation-instruction.html' -13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installation-instruction.html>`_ +14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/build-instruction.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/build-instruction.html' -14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/build-instruction.html>`_ +15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/release-notes.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/release-notes.html' -15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/release-notes.html>`_ +.. [1] OpenDaylight Boron RC3.5 is used when Service Function Chaining is enabled in Fuel plugin. |