aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 19:42:41 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 22:08:29 +0200
commit644e5fdfa2f49b988a5150e2a4eefc12daecd845 (patch)
treee0d02c21d32dcd56c0aa2f8bca8ddb14dcb32621 /mcp/config
parenta75af3d4c30af050dd15c0f875142f6328874fe4 (diff)
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/labs/local/idf-pod1.yaml7
-rw-r--r--mcp/config/labs/local/pod1.yaml7
-rw-r--r--mcp/config/scenario/baremetal/.gitkeep0
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml7
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml7
-rw-r--r--mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml7
-rw-r--r--mcp/config/scenario/defaults-aarch64.yaml8
-rw-r--r--mcp/config/scenario/defaults-x86_64.yaml8
-rw-r--r--mcp/config/scenario/virtual/.gitkeep0
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml7
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml7
-rw-r--r--mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml7
-rwxr-xr-xmcp/config/states/dpdk10
-rwxr-xr-xmcp/config/states/maas10
-rwxr-xr-xmcp/config/states/networks10
-rwxr-xr-xmcp/config/states/neutron_compute10
-rwxr-xr-xmcp/config/states/opendaylight10
-rwxr-xr-xmcp/config/states/openstack10
-rwxr-xr-xmcp/config/states/openstack_ha10
-rwxr-xr-xmcp/config/states/virtual_control_plane10
20 files changed, 134 insertions, 18 deletions
diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml
index 7932f8896..95af596a4 100644
--- a/mcp/config/labs/local/idf-pod1.yaml
+++ b/mcp/config/labs/local/idf-pod1.yaml
@@ -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
+##############################################################################
---
### LF POD 2 installer descriptor file ###
diff --git a/mcp/config/labs/local/pod1.yaml b/mcp/config/labs/local/pod1.yaml
index 702a53398..cf60dcf72 100644
--- a/mcp/config/labs/local/pod1.yaml
+++ b/mcp/config/labs/local/pod1.yaml
@@ -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
+##############################################################################
---
### LF POD 2 descriptor file ###
diff --git a/mcp/config/scenario/baremetal/.gitkeep b/mcp/config/scenario/baremetal/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/mcp/config/scenario/baremetal/.gitkeep
+++ /dev/null
diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 881359b24..e135b7686 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: baremetal-mcp-ocata-ovs-ha.local
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index 8b937835c..0d47682c1 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: baremetal-mcp-ocata-ovs-dpdk-ha.local
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index b48738562..52a422b3c 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: baremetal-mcp-ocata-odl-ha.local
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml
index 0790bbb7c..24a4037b4 100644
--- a/mcp/config/scenario/defaults-aarch64.yaml
+++ b/mcp/config/scenario/defaults-aarch64.yaml
@@ -1,5 +1,11 @@
+##############################################################################
+# 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
+##############################################################################
---
-# yamllint disable-line rule:line-length
base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
virtual:
default:
diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index adb6f6241..4dfff71db 100644
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -1,5 +1,11 @@
+##############################################################################
+# 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
+##############################################################################
---
-# yamllint disable-line rule:line-length
base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
virtual:
default:
diff --git a/mcp/config/scenario/virtual/.gitkeep b/mcp/config/scenario/virtual/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/mcp/config/scenario/virtual/.gitkeep
+++ /dev/null
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
index 862029912..2f4d401db 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: virtual-mcp-ocata-ovs.local
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index 02977f793..79bd84323 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: virtual-mcp-ocata-ovs-dpdk.local
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index b3684c109..78923531d 100644
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -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
+##############################################################################
---
cluster:
domain: virtual-mcp-ocata-odl-router.local
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index 7cee70a88..9ae103d90 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 232f98c88..685dbc9bd 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 505153a8a..361e675a8 100755
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
# Determine public network based on external IPs from compute node
# NOTE: mask currently hardcoded to /24
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute
index 6266b0f18..2a2a2ef78 100755
--- a/mcp/config/states/neutron_compute
+++ b/mcp/config/states/neutron_compute
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
salt -I 'neutron:compute' state.sls neutron
salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index e1ec1982f..7b63483d8 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
salt -I 'opendaylight:server' state.sls opendaylight
salt -I 'opendaylight:client' state.sls opendaylight.client
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index beb6abb63..968310334 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
salt -I 'nfs:server' file.mkdir /srv/nova/instances
salt -I 'nfs:server' state.sls nfs
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index c4c513da1..230288f4f 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 645009be8..58ae33506 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -1,5 +1,11 @@
-#!/bin/bash
-set -x
+#!/bin/bash -x
+##############################################################################
+# 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
+##############################################################################
# shellcheck disable=SC1090
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"