+++ /dev/null
-##############################################################################
-# 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)
+++ /dev/null
-##############################################################################
-# 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.
-
-
+++ /dev/null
-##############################################################################
-# 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
+++ /dev/null
-##############################################################################
-# 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',
- }
-}
+##############################################################################
+# 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"
+++ /dev/null
-##############################################################################
-# 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)
+++ /dev/null
-##############################################################################
-# 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=
+##############################################################################
+# 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"
+++ /dev/null
-=================================
-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.
+++ /dev/null
-# -*- 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
+++ /dev/null
-#!/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"
+++ /dev/null
-#!/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
+##############################################################################
+# 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
+##############################################################################
+# 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
+##############################################################################
+# 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
+##############################################################################
+# 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
+##############################################################################
+# 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
+##############################################################################
+# 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
+##############################################################################
+# 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
Code Review / fuel.git / commitdiff