diff --git a/defaults/main.yml b/defaults/main.yml index 4f575ff1..c171f19b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,9 +16,9 @@ openstack_code_name: Mitaka openstack_release: master -openstack_host_systat_enabled: true -openstack_host_systat_interval: 1 -openstack_host_systat_statistics_hour: 23 +openstack_host_sysstat_enabled: true +openstack_host_sysstat_interval: 1 +openstack_host_sysstat_statistics_hour: 23 ## Defined required kernel. presently 3.13.0-32-generic openstack_host_required_kernel: 3.13.0-34-generic diff --git a/templates/sysstat.cron.j2 b/templates/sysstat.cron.j2 index 6414cd38..088bb8d8 100644 --- a/templates/sysstat.cron.j2 +++ b/templates/sysstat.cron.j2 @@ -4,7 +4,7 @@ PATH=/usr/lib/sysstat:/usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin # Activity reports every 10 minutes everyday -*/{{ openstack_host_systat_interval }} * * * * root command -v debian-sa1 > /dev/null && debian-sa1 1 1 +*/{{ openstack_host_sysstat_interval }} * * * * root command -v debian-sa1 > /dev/null && debian-sa1 1 1 # Additional run at 23:59 to rotate the statistics file -59 {{ openstack_host_systat_statistics_hour }} * * * root command -v debian-sa1 > /dev/null && debian-sa1 60 2 +59 {{ openstack_host_sysstat_statistics_hour }} * * * root command -v debian-sa1 > /dev/null && debian-sa1 60 2 diff --git a/templates/sysstat.default.j2 b/templates/sysstat.default.j2 index e97b0f2a..c0eb1450 100644 --- a/templates/sysstat.default.j2 +++ b/templates/sysstat.default.j2 @@ -8,4 +8,4 @@ # Should sadc collect system activity informations? Valid values # are "true" and "false". Please do not put other values, they # will be overwritten by debconf! -ENABLED="{{ openstack_host_systat_enabled }}" +ENABLED="{{ openstack_host_sysstat_enabled | bool | lower }}"