aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/Makefile8
-rw-r--r--build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch22
-rw-r--r--build/config.mk4
-rw-r--r--build/docker/Makefile11
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml2
-rwxr-xr-xbuild/fuel_build_loop1
-rw-r--r--deploy/deploy-config.py29
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml202
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml199
10 files changed, 123 insertions, 363 deletions
diff --git a/build/Makefile b/build/Makefile
index f49947b88..c4775a3da 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -105,9 +105,8 @@ include cache.mk
$(ISOCACHE):
# Clone Fuel to non-persistent location and build
- if [ ! -d /tmp/fuel-main ]; then \
- cd /tmp && git clone $(FUEL_MAIN_REPO); \
- fi
+ sudo rm -rf /tmp/fuel-main
+ cd /tmp && git clone $(FUEL_MAIN_REPO)
cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
@echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE)
# Remove Docker optimizations, otherwise multistrap will fail during
@@ -133,10 +132,9 @@ $(ISOCACHE):
# OPNFV patches at Fuel build time
# Need to be commited in order for them to be considered by the Fuel
# build system
- cd /tmp/fuel-main && git config user.name "Fuel OPNFV"
- cd /tmp/fuel-main && git config user.email "fuel@opnfv.org"
cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
+ cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
# Repeat build up to three times
sudo -E ./fuel_build_loop
cp /tmp/fuel-main/build/artifacts/fuel*.iso .
diff --git a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
new file mode 100644
index 000000000..d486f2354
--- /dev/null
+++ b/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
@@ -0,0 +1,22 @@
+From: Fuel OPNFV <fuel@opnfv.org>
+Date: Wed, 3 Aug 2016 09:41:21 +0200
+Subject: [PATCH] Mark Intel 82599 10 Gigabit NIC as DPDK capable
+
+This NIC is used on Ericsson POD2 but Fuel doesn't allow to activate
+DPDK on it.
+---
+ nailgun/nailgun/fixtures/openstack.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
+index 74fa509..d08a4fc 100644
+--- a/nailgun/nailgun/fixtures/openstack.yaml
++++ b/nailgun/nailgun/fixtures/openstack.yaml
+@@ -2215,3 +2215,3 @@
+ "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
+- "14e4:16ae", "14e4:163e", "14e4:16a4"
++ "14e4:16ae", "14e4:163e", "14e4:16a4", "8086:10f8"
+ ]
+--
+1.9.1
+
diff --git a/build/config.mk b/build/config.mk
index e3766a7ef..f78043e18 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -28,6 +28,10 @@ export NETWORKCHECKER_COMMIT?=fcb47dd095a76288aacf924de574e39709e1f3ca
export FUELUPGRADE_COMMIT?=c1c4bac6a467145ac4fac73e4a7dd2b00380ecfb
export FUEL_UI_COMMIT?=90de7ef4477230cb7335453ed26ed4306ca6f04f
+# for the patches applying purposes
+export GIT_COMMITTER_NAME?=Fuel OPNFV
+export GIT_COMMITTER_EMAIL?=fuel@opnfv.org
+
DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64
DOCKER_TAG := docker-latest
diff --git a/build/docker/Makefile b/build/docker/Makefile
index a2434447a..d4423b0a2 100644
--- a/build/docker/Makefile
+++ b/build/docker/Makefile
@@ -10,6 +10,15 @@
SHELL = /bin/bash
FILES = $(wildcard ubuntu-builder/*) runcontext
+DOCKER_VER := $(shell [[ "$$(docker version --format '{{.Client.Version}}')" =~ ([0-9]+)\.([0-9]+) ]] && echo $$(( $${BASH_REMATCH[1]} * 100 + $${BASH_REMATCH[2]} )))
+
+# Don't use -f flag when docker is newer than 1.9
+# https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag
+ifeq ($(shell echo "$(DOCKER_VER)>109" | bc), 1)
+ tag_flags :=
+else
+ tag_flags := -f
+endif
.PHONY: all
all: .docker
@@ -25,7 +34,7 @@ all: .docker
test -n "${NO_PROXY}" && sed -i "s;INSERT_NO_PROXY;${NO_PROXY};" ubuntu-builder/Dockerfile || exit 0
sed -i '/INSERT_/d' ubuntu-builder/Dockerfile
/usr/bin/docker build --rm=true --no-cache=true -t opnfv.org/ubuntu-builder:14.04 ubuntu-builder
- /usr/bin/docker tag -f opnfv.org/ubuntu-builder:14.04 opnfv.org/ubuntu-builder
+ /usr/bin/docker tag ${tag_flags} opnfv.org/ubuntu-builder:14.04 opnfv.org/ubuntu-builder
touch .docker
.PHONY: clean
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
new file mode 100644
index 000000000..d6fea9269
--- /dev/null
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/packages.yaml
@@ -0,0 +1,2 @@
+packages:
+ - "collectd"
diff --git a/build/fuel_build_loop b/build/fuel_build_loop
index 4a0dda6f4..324f28c1a 100755
--- a/build/fuel_build_loop
+++ b/build/fuel_build_loop
@@ -20,7 +20,6 @@ do
cnt=$[cnt + 1]
echo -e "\n\n\n*** Starting build attempt # $cnt"
cd /tmp/fuel-main
- make clean
make iso
rc=$?
if [ $rc -ne 0 ]; then
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index d87103b6c..c59957540 100644
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@ -131,23 +131,11 @@ def merge_fuel_plugin_version_list(list1, list2):
return final_list
-def merge_lists(list1, list2):
- if list1 and list2:
- if isinstance(list1[0], dict):
- if 'plugin_version' in list1[0].get('metadata', {}):
- return merge_fuel_plugin_version_list(list1, list2)
- else:
- warning("Lists with dictionary inside are not mergeable! "
- "List2 will overwrite List1. "
- "List1: %s\nList2: %s"
- % (list1, list2))
- return list2
- else:
- return list2
- elif list1:
- return list1
- else:
- return list2
+def merge_networks(list_1, list_2):
+ new_nets = {x.get('name'): x for x in list_2}
+
+ return [new_nets.get(net.get('name'), net) for net in list_1]
+
def merge_dicts(dict1, dict2):
@@ -156,7 +144,12 @@ def merge_dicts(dict1, dict2):
if isinstance(dict1[k], dict) and isinstance(dict2[k], dict):
yield (k, dict(merge_dicts(dict1[k], dict2[k])))
elif isinstance(dict1[k], list) and isinstance(dict2[k], list):
- yield (k, merge_lists(dict1[k], dict2[k]))
+ if k == 'versions':
+ yield (k,
+ merge_fuel_plugin_version_list(dict1[k], dict2[k]))
+ if k == 'networks':
+ yield (k,
+ merge_networks(dict1[k], dict2[k]))
else:
# If one of the values is not a dict nor a list,
# you can't continue merging it.
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 66b07d5b8..91eb7b342 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: NFV OVS HA deployment
- version: 0.0.5
- created: Apr 20 2016
- comment: Rebased to Fuel8
+ version: 0.9.0
+ created: Jul 12 2016
+ comment: Rebased to Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,116 +32,57 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
- - module: fuel-plugin-ovsnfv
- module-config-name: fuel-nfvovs
- module-config-version: 0.0.2
+ - module: fuel-plugin-ovs
+ module-config-name: fuel-nshovs
+ module-config-version: 0.9.0
module-config-override:
- # Module config overrides
+ metadata:
+ versions:
+ - install_dpdk:
+ value: true
+ metadata:
+ plugin_version: 0.9.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
# configuration name-space settings
dea-override-config:
+ fuel:
+ FEATURE_GROUPS:
+ - experimental
environment:
net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: controller
- transformations: transformations_1
+ transformations: transformations_vlan
- id: 2
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: mongo,controller
- transformations: transformations_1
+ transformations: transformations_vlan
- id: 3
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,controller
- transformations: transformations_1
+ transformations: transformations_vlan
- id: 4
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_1
+ transformations: transformations_dpdk
+ attributes: attributes_1
- id: 5
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_1
+ transformations: transformations_dpdk
+ attributes: attributes_1
- 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-prv
- provider: ovs
- - action: add-br
- name: br-aux
- - action: add-patch
- bridges:
- - br-prv
- - br-aux
- mtu: 65000
- provider: ovs
- - action: add-port
- bridge: br-fw-admin
- name: eno49
- - action: add-port
- bridge: br-mgmt
- name: ens1f0.100
- - action: add-port
- bridge: br-storage
- name: ens1f0.200
- - action: add-port
- bridge: br-aux
- name: ens1f0
- - action: add-port
- bridge: br-ex
- name: ens1f0.753
- transformations_2:
- 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-prv
- provider: ovs
- - action: add-br
- name: br-aux
- - action: add-patch
- bridges:
- - br-prv
- - br-aux
- mtu: 65000
- provider: ovs
- - action: add-port
- bridge: br-fw-admin
- name: eno49
- - action: add-port
- bridge: br-mgmt
- name: ens1f0.100
- - action: add-port
- bridge: br-storage
- name: ens1f0.200
- - action: add-port
- bridge: br-aux
- name: ens1f0
+ attributes_1:
+ hugepages:
+ dpdk:
+ value: 128
+ nova:
+ value:
+ '2048': 256
network:
networking_parameters:
@@ -166,81 +107,6 @@ dea-override-config:
vlan_start: null
name: private
vlan_start: null
- - cidr: 10.118.101.0/24
- gateway: 10.118.101.1
- ip_ranges:
- - - 10.118.101.180
- - 10.118.101.190
- 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: 753
- - cidr: 192.168.20.0/24
- gateway: null
- ip_ranges:
- - - 192.168.20.1
- - 192.168.20.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
- - cidr: 192.168.10.0/24
- gateway: null
- ip_ranges:
- - - 192.168.10.1
- - 192.168.10.254
- meta:
- cidr: 192.168.0.0/24
- configurable: true
- map_priority: 2
- name: management
- notation: cidr
- render_addr_mask: internal
- render_type: cidr
- use_gateway: false
- vips:
- - haproxy
- - vrouter
- vlan_start: 101
- name: management
- vlan_start: 100
- - 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
dha-override-config:
nodes:
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 08fc041e3..779c6e14a 100644
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -22,8 +22,8 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: NFV KVM NO-HA deployment
- version: 0.0.4
- created: Mar 18 2016
+ version: 0.0.5
+ created: Aug 03 2016
comment: Ceph cannot be assigned to compute, using a seperate node for it
##############################################################################
@@ -32,9 +32,9 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
- - module: fuel-plugin-qemu
+ - module: fuel-plugin-kvm
module-config-name: fuel-nfvkvm
- module-config-version: 0.0.2
+ module-config-version: 0.9.0
module-config-override:
# Module config overrides
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 73813d128..e3c07db35 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: NFV OVS NO-HA deployment
- version: 0.0.4
- created: Apr 20 2016
- comment: NFV OVS NO-HA Rebased for Fuel8
+ version: 0.9.0
+ created: Jul 12 2016
+ comment: NFV OVS NO-HA Rebased for Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,112 +32,54 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
- - module: fuel-plugin-ovsnfv
- module-config-name: fuel-nfvovs
- module-config-version: 0.0.2
+ - module: fuel-plugin-ovs
+ module-config-name: fuel-nshovs
+ module-config-version: 0.9.0
module-config-override:
- # Module config overrides
+ metadata:
+ versions:
+ - install_dpdk:
+ value: true
+ metadata:
+ plugin_version: 0.9.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
# configuration name-space settings
dea-override-config:
+ fuel:
+ FEATURE_GROUPS:
+ - experimental
environment:
net_segment_type: vlan
nodes:
- id: 1
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: mongo,controller
- transformations: transformations_1
+ transformations: transformations_vlan
- id: 2
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_1
+ transformations: transformations_dpdk
+ attributes: attributes_1
- id: 3
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_1
+ transformations: transformations_dpdk
+ attributes: attributes_1
- id: 4
- interfaces: interfaces_1
+ interfaces: interfaces_dpdk
role: ceph-osd,compute
- transformations: transformations_1
+ transformations: transformations_dpdk
+ attributes: attributes_1
- 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-prv
- provider: ovs
- - action: add-br
- name: br-aux
- - action: add-patch
- bridges:
- - br-prv
- - br-aux
- mtu: 65000
- provider: ovs
- - action: add-port
- bridge: br-fw-admin
- name: eno49
- - action: add-port
- bridge: br-mgmt
- name: ens1f0.100
- - action: add-port
- bridge: br-storage
- name: ens1f0.200
- - action: add-port
- bridge: br-aux
- name: ens1f0
- - action: add-port
- bridge: br-ex
- name: ens1f0.753
- transformations_2:
- 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-prv
- provider: ovs
- - action: add-br
- name: br-aux
- - action: add-patch
- bridges:
- - br-prv
- - br-aux
- mtu: 65000
- provider: ovs
- - action: add-port
- bridge: br-fw-admin
- name: eno49
- - action: add-port
- bridge: br-mgmt
- name: ens1f0.100
- - action: add-port
- bridge: br-storage
- name: ens1f0.200
- - action: add-port
- bridge: br-aux
- name: ens1f0
+ attributes_1:
+ hugepages:
+ dpdk:
+ value: 128
+ nova:
+ value:
+ '2048': 256
network:
networking_parameters:
@@ -162,81 +104,6 @@ dea-override-config:
vlan_start: null
name: private
vlan_start: null
- - cidr: 10.118.101.0/24
- gateway: 10.118.101.1
- ip_ranges:
- - - 10.118.101.180
- - 10.118.101.190
- 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: 753
- - cidr: 192.168.20.0/24
- gateway: null
- ip_ranges:
- - - 192.168.20.1
- - 192.168.20.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
- - cidr: 192.168.10.0/24
- gateway: null
- ip_ranges:
- - - 192.168.10.1
- - 192.168.10.254
- meta:
- cidr: 192.168.0.0/24
- configurable: true
- map_priority: 2
- name: management
- notation: cidr
- render_addr_mask: internal
- render_type: cidr
- use_gateway: false
- vips:
- - haproxy
- - vrouter
- vlan_start: 101
- name: management
- vlan_start: 100
- - 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
dha-override-config:
# disks: