Merge "Revert "Adjust logrotate configuration to use date suffix"" into stable/mitaka

deployment/puppet/openstack/manifests/logrotate.pp

@@ -73,16 +73,6 @@ class openstack::logrotate (
     line  => "maxsize ${maxsize}",
     match => '^maxsize',
     after => '^minsize',
-  } ->
-  file_line { 'logrotate-date-extension':
-    line  => 'dateext',
-    match => '^dateext',
-    after => '^maxsize',
-  } ->
-  file_line { 'logrotate-date-format':
-    line  => 'dateformat -%Y%m%d-%s',
-    match => '^dateformat ',
-    after => '^dateext',
   }
 
   if $debug {

deployment/puppet/openstack/spec/classes/openstack_logrotate_spec.rb

@@ -31,9 +31,7 @@ describe 'openstack::logrotate' do
          'logrotate-compress',
          'logrotate-delaycompress',
          'logrotate-minsize',
-         'logrotate-maxsize',
-         'logrotate-date-extension',
-         'logrotate-date-format',].each do |item|
+         'logrotate-maxsize',].each do |item|
           should contain_file_line(item)
         end
         should contain_cron('fuel-logrotate').with_minute('*/30')

deployment/puppet/openstack/templates/10-fuel.conf.erb

@@ -48,7 +48,6 @@
   notifempty
 
   # logrotate allows to use only year, month, day and unix epoch
-  dateext
   dateformat -%Y%m%d-%s
 
   # number of rotated files to keep