From e8d748cd655937bed234fc02f2f8e3406d96f4dc Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sat, 17 Sep 2016 00:12:33 +0200 Subject: Repo tidy-up + licence scrubing - Added licences and (c) to files not complying to Licence and (c) policies. - Removed example templates not having correct licence claims and no longer being rellevant. - Removed the Vagrant deployment method as it is not used, not rebased/up to date and not holding correct license claims. Strategies used: - Machine generated are not assigned an licence text, the licence follow from the source. - Generated patch files are not assigned an licence text, the licence follow from the source. Change-Id: I9763f076eae51fbb2d4e5cb8cacfa4bb6cf338cc Signed-off-by: Jonas Bjurel (cherry picked from commit 65b7cfcd862a75be72fb98777190c49f8b6ea0d3) --- .../puppet/modules/opnfv/manifests/control-bond.pp | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100644 build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp (limited to 'build/f_example_control_bond/puppet/modules/opnfv/manifests/control-bond.pp') 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', - } -} -- cgit 1.2.3-korg