aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles/config_files
diff options
context:
space:
mode:
authorMatthias Runge <mrunge@redhat.com>2019-12-17 14:42:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-12-17 14:42:39 +0000
commitaaefdd5faa4433a016785effc662cea060d46862 (patch)
tree9d5e9a24ec7e4a731e51ecc97ceca3a8eedc4734 /docker/ansible/roles/config_files
parent4d100488be83a24e9e5b80b38c39681e9b1df970 (diff)
parent4abee7e46d1602f796f8aebed0a51da9476d0832 (diff)
Merge "Updates/Fix on Legal/License Headers"
Diffstat (limited to 'docker/ansible/roles/config_files')
-rw-r--r--docker/ansible/roles/config_files/tasks/main.yml5
-rw-r--r--docker/ansible/roles/config_files/tasks/make_mcelog.yml5
-rw-r--r--docker/ansible/roles/config_files/tasks/mcelog.yml5
-rw-r--r--docker/ansible/roles/config_files/templates/experimental/logparser.conf.j25
-rw-r--r--docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j25
5 files changed, 15 insertions, 10 deletions
diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml
index aa12b7d7..3221242d 100644
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@ -1,16 +1,17 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
---
- name: Clean collectd config dir path
diff --git a/docker/ansible/roles/config_files/tasks/make_mcelog.yml b/docker/ansible/roles/config_files/tasks/make_mcelog.yml
index d05b9433..938396c8 100644
--- a/docker/ansible/roles/config_files/tasks/make_mcelog.yml
+++ b/docker/ansible/roles/config_files/tasks/make_mcelog.yml
@@ -1,16 +1,17 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
---
- name: extract mcelog from online archive
diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml
index be185092..49bbec93 100644
--- a/docker/ansible/roles/config_files/tasks/mcelog.yml
+++ b/docker/ansible/roles/config_files/tasks/mcelog.yml
@@ -1,16 +1,17 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
---
- name: install mcelog package
diff --git a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2 b/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2
index 3802768b..1f1a725b 100644
--- a/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2
+++ b/docker/ansible/roles/config_files/templates/experimental/logparser.conf.j2
@@ -1,16 +1,17 @@
-# Copyright 2019 OPNFV
+# Copyright 2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
LoadPlugin logparser
diff --git a/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
index 97a4ce40..1ff8b228 100644
--- a/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
+++ b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
@@ -1,16 +1,17 @@
-# Copyright 2019 OPNFV
+# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
LoadPlugin snmp_agent