Skip to content

Commit

Permalink
Update timezone to 734918982a512f51a3f1855396d2d7da3f37f53c
Browse files Browse the repository at this point in the history
734918982a512f51a3f1855396d2d7da3f37f53c new release v3.3.0
53b83b7f617780531af919c55d0a883d3ed728e1 Merge pull request redhat-openstack#23 from sbakker/master
1e662cb18535a8df9439b5142f39d2d02060bc1c Make comment in timezone file conditional
  • Loading branch information
xbezdick committed May 11, 2015
1 parent 54ce717 commit 5d76077
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ mod 'tempest',
:git => 'https://github.com/stackforge/puppet-tempest.git'

mod 'timezone',
:commit => '0b3e3f06c7c3c4e4ab571666cceb7f4779e69856',
:commit => '734918982a512f51a3f1855396d2d7da3f37f53c',
:git => 'https://github.com/saz/puppet-timezone.git'

mod 'tripleo',
Expand Down
2 changes: 2 additions & 0 deletions timezone/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
$localtime_file = '/etc/localtime'
$timezone_file = '/etc/timezone'
$timezone_file_template = 'timezone/timezone.erb'
$timezone_file_supports_comment = false
$timezone_update = 'dpkg-reconfigure -f noninteractive tzdata'
}
'RedHat', 'Linux': {
Expand All @@ -33,6 +34,7 @@
$localtime_file = '/etc/localtime'
$timezone_file = '/etc/timezone'
$timezone_file_template = 'timezone/timezone.erb'
$timezone_file_supports_comment = true
$timezone_update = 'emerge --config timezone-data'
}
'Archlinux': {
Expand Down
2 changes: 1 addition & 1 deletion timezone/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
],
"name": "saz-timezone",
"version": "3.2.0",
"version": "3.3.0",
"source": "git://github.com/saz/puppet-timezone",
"author": "saz",
"license": "Apache License, Version 2.0",
Expand Down
2 changes: 2 additions & 0 deletions timezone/templates/timezone.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
<%- if @timezone_file_supports_comment -%>
# Managed by puppet - do not modify
<%- end -%>
<%= @timezone %>

0 comments on commit 5d76077

Please sign in to comment.