From 7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5 Mon Sep 17 00:00:00 2001 From: TsaLaGi Date: Tue, 27 Feb 2018 09:17:38 -0500 Subject: Merge conflict Revert "Merge "ansible: add ansible scripts to configure .conf file on collectd nodes"" This reverts commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a, reversing changes made to b26034d05aa81f624e9bcee2c8e82a1cacfe44c4. Change-Id: I6f77b4432bbe0de29db3e099263e461e3043b22e Signed-off-by: TsaLaGi --- .../roles/config_files/templates/hugepages.conf.j2 | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 docker/ansible/roles/config_files/templates/hugepages.conf.j2 (limited to 'docker/ansible/roles/config_files/templates/hugepages.conf.j2') diff --git a/docker/ansible/roles/config_files/templates/hugepages.conf.j2 b/docker/ansible/roles/config_files/templates/hugepages.conf.j2 deleted file mode 100644 index b391a398..00000000 --- a/docker/ansible/roles/config_files/templates/hugepages.conf.j2 +++ /dev/null @@ -1,24 +0,0 @@ -#Copyright 2018 OPNFV and Intel Corporation -# -# 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 -# -# 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 hugepages - - - ReportPerNodeHP true - ReportRootHP true - ValuesPages true - ValuesBytes false - ValuesPercentage false - - -- cgit 1.2.3-korg