diff options
5 files changed, 68 insertions, 51 deletions
diff --git a/docker/ansible/roles/config_files/tasks/additional_configs.yml b/docker/ansible/roles/config_files/tasks/additional_configs.yml new file mode 100644 index 00000000..28cad8a4 --- /dev/null +++ b/docker/ansible/roles/config_files/tasks/additional_configs.yml @@ -0,0 +1,23 @@ +#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. +--- + +- name: copy additional configuration files to target system + template: + src: "{{ item }}" + dest: "{{ config_file_dir }}/{{ item | basename | regex_replace('\\.j2','') }}" + with_fileglob: + - "{{ additional_configs_path }}" + tags: + - copy_additional_configs diff --git a/docker/ansible/roles/config_files/tasks/default_read_import.yml b/docker/ansible/roles/config_files/tasks/default_read_import.yml index 589ace34..d70919b3 100644 --- a/docker/ansible/roles/config_files/tasks/default_read_import.yml +++ b/docker/ansible/roles/config_files/tasks/default_read_import.yml @@ -13,6 +13,14 @@ # limitations under the License. --- +- name: enable contextswitch plugin + replace: + path: "{{ config_file_dir }}/default_read_plugins.conf" + regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$' + replace: '\1LoadPlugin contextswitch\2' + tags: + - contextswitch + - name: enable cpu plugin replace: path: "{{ config_file_dir }}/default_read_plugins.conf" @@ -29,6 +37,14 @@ tags: - cpufreq +- name: enable df plugin + replace: + path: "{{ config_file_dir }}/default_read_plugins.conf" + regexp: '(\s+)#LoadPlugin df(\s+.*)?$' + replace: '\1LoadPlugin df\2' + tags: + - df + - name: enable disk plugin replace: path: "{{ config_file_dir }}/default_read_plugins.conf" @@ -37,6 +53,30 @@ tags: - disk +- name: enable ethstat plugin + replace: + path: "{{ config_file_dir }}/default_read_plugins.conf" + regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$' + replace: '\1LoadPlugin ethstat\2' + tags: + - ethstat + +- name: enable ipc plugin + replace: + path: "{{ config_file_dir }}/default_read_plugins.conf" + regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$' + replace: '\1LoadPlugin ipc\2' + tags: + - ipc + +- name: enable irq plugin + replace: + path: "{{ config_file_dir }}/default_read_plugins.conf" + regexp: '(\s+)#LoadPlugin irq(\s+.*)?$' + replace: '\1LoadPlugin irq\2' + tags: + - irq + - name: enable load plugin replace: path: "{{ config_file_dir }}/default_read_plugins.conf" @@ -69,46 +109,14 @@ tags: - processes -- name: enable irq plugin - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin irq(\s+.*)?$' - replace: '\1LoadPlugin irq\2' - tags: - - irq - - name: enable swap plugin replace: - path: "{{ config_file_dir }}/default_plugins.conf" + path: "{{ config_file_dir }}/default_read_plugins.conf" regexp: '(\s+)#LoadPlugin swap(\s+.*)?$' replace: '\1LoadPlugin swap\2' tags: - swap -- name: enable ethstat plugin - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$' - replace: '\1LoadPlugin ethstat\2' - tags: - - ethstat - -- name: enable ipc plugin - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$' - replace: '\1LoadPlugin ipc\2' - tags: - - ipc - -- name: enable df plugin - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin df(\s+.*)?$' - replace: '\1LoadPlugin df\2' - tags: - - df - - name: enable turbostat plugin replace: path: "{{ config_file_dir }}/default_read_plugins.conf" @@ -124,12 +132,3 @@ replace: '\1LoadPlugin uptime\2' tags: - uptime - -- name: enable contextswitch plugin - replace: - path: "{{ config_file_dir }}/default_read_plugins.conf" - regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$' - replace: '\1LoadPlugin contextswitch\2' - tags: - - contextswitch - diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml index 7d3919a1..52535a09 100644 --- a/docker/ansible/roles/config_files/tasks/main.yml +++ b/docker/ansible/roles/config_files/tasks/main.yml @@ -74,12 +74,5 @@ - name: enable ipmi plugin include: ipmi.yml -- name: copy additional configuration files to target system - template: - src: "{{ item }}" - dest: "{{ config_file_dir }}/{{ item | basename | regex_replace('\\.j2','') }}" - tags: - - always - - copy_additional_configs - with_fileglob: - - "{{ additional_configs_path }}" +- name: copy additional config files + include: additional_configs.yml diff --git a/puppet-barometer/templates/collectd-ceil.conf.erb b/puppet-barometer/templates/collectd-ceil.conf.erb index b21accd1..7f3b9c03 100644 --- a/puppet-barometer/templates/collectd-ceil.conf.erb +++ b/puppet-barometer/templates/collectd-ceil.conf.erb @@ -30,6 +30,7 @@ # Batch size BATCH_SIZE "1" + DEFAULT_ARCHIVE_POLICY "high" # Service endpoint addresses OS_AUTH_URL "<%=@auth_url-%>/v3" diff --git a/puppet-barometer/templates/collectd-gnocchi.conf.erb b/puppet-barometer/templates/collectd-gnocchi.conf.erb index 71fec748..9ab06cda 100644 --- a/puppet-barometer/templates/collectd-gnocchi.conf.erb +++ b/puppet-barometer/templates/collectd-gnocchi.conf.erb @@ -16,6 +16,7 @@ # Batch size BATCH_SIZE "1" + DEFAULT_ARCHIVE_POLICY "high" # Service endpoint addresses OS_AUTH_URL "<%=@auth_url-%>/v3" |