From 94825e25dcc5bf4a8490690fc1cf423df0e9d7fe Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 14 Oct 2017 19:42:41 +0200 Subject: Add license headers where missing While at it, compact 'set' into bash shebang where possible and add `make patches-copyright` target to simplify adding patch license headers. Change-Id: I0c841de72e5709e5eef915a52c5ec4a7fc0f7c37 Signed-off-by: Alexandru Avadanii (cherry picked from commit 644e5fdfa2f49b988a5150e2a4eefc12daecd845) --- mcp/salt-formulas/maas/machines/delete.sls | 7 +++++++ mcp/salt-formulas/maas/machines/mark_broken_fixed.sls | 7 +++++++ mcp/salt-formulas/maas/pxe_nat.sls | 7 +++++++ mcp/salt-formulas/maas/pxe_route.sls | 7 +++++++ mcp/salt-formulas/opendaylight/client.sls | 7 +++++++ mcp/salt-formulas/opendaylight/files/setenv.shell | 7 +++++++ mcp/salt-formulas/opendaylight/init.sls | 7 +++++++ mcp/salt-formulas/opendaylight/map.jinja | 7 +++++++ mcp/salt-formulas/opendaylight/server.sls | 7 +++++++ 9 files changed, 63 insertions(+) (limited to 'mcp/salt-formulas') diff --git a/mcp/salt-formulas/maas/machines/delete.sls b/mcp/salt-formulas/maas/machines/delete.sls index 306dbca31..dbb625a02 100644 --- a/mcp/salt-formulas/maas/machines/delete.sls +++ b/mcp/salt-formulas/maas/machines/delete.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# 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 +############################################################################## {%- from "maas/map.jinja" import region with context %} maas_login_admin: diff --git a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls index 4829fb1d0..e036d610d 100644 --- a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls +++ b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# 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 +############################################################################## {%- from "maas/map.jinja" import region with context %} maas_login_admin: diff --git a/mcp/salt-formulas/maas/pxe_nat.sls b/mcp/salt-formulas/maas/pxe_nat.sls index e70efaf9d..701bae07a 100644 --- a/mcp/salt-formulas/maas/pxe_nat.sls +++ b/mcp/salt-formulas/maas/pxe_nat.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# 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 +############################################################################## net.ipv4.ip_forward: sysctl.present: - value: 1 diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls index e6e9a7801..5167c9ad8 100644 --- a/mcp/salt-formulas/maas/pxe_route.sls +++ b/mcp/salt-formulas/maas/pxe_route.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# 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 +############################################################################## routes: network.routes: - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }} diff --git a/mcp/salt-formulas/opendaylight/client.sls b/mcp/salt-formulas/opendaylight/client.sls index dbffc5709..dba51b399 100644 --- a/mcp/salt-formulas/opendaylight/client.sls +++ b/mcp/salt-formulas/opendaylight/client.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc. and others. +# 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 +############################################################################## {%- from "opendaylight/map.jinja" import client with context %} {%- if client.get('enabled', True) %} diff --git a/mcp/salt-formulas/opendaylight/files/setenv.shell b/mcp/salt-formulas/opendaylight/files/setenv.shell index 972bbeff4..d7dfbd96c 100644 --- a/mcp/salt-formulas/opendaylight/files/setenv.shell +++ b/mcp/salt-formulas/opendaylight/files/setenv.shell @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc. and others. +# 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 +############################################################################## {%- from "opendaylight/map.jinja" import server with context -%} # export JAVA_HOME # Location of Java installation export JAVA_MIN_MEM={{ server.java_min_mem }} # Minimum memory for the JVM diff --git a/mcp/salt-formulas/opendaylight/init.sls b/mcp/salt-formulas/opendaylight/init.sls index 17feb15e7..132f69b33 100644 --- a/mcp/salt-formulas/opendaylight/init.sls +++ b/mcp/salt-formulas/opendaylight/init.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc. and others. +# 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 +############################################################################## include: {% if pillar.opendaylight.server is defined %} diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja index 755f878e2..9e9df1dc1 100644 --- a/mcp/salt-formulas/opendaylight/map.jinja +++ b/mcp/salt-formulas/opendaylight/map.jinja @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc. and others. +# 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 +############################################################################## {% set server = salt['grains.filter_by']({ 'Debian': { diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index f7a97417e..5de4eee35 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc. and others. +# 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 +############################################################################## {% from "opendaylight/map.jinja" import server with context %} {%- if server.enabled %} -- cgit 1.2.3-korg