From e707431b69d386a3b38d7c4b929fb10ac53d5b1f Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 19 Apr 2017 12:30:44 -0400 Subject: [PATCH] Move puppet-timezone to server.pp This drops the puppet dependency from our diskimages. Change-Id: I653b5f31ce7075e455de8617c8604e78fc7eb449 Signed-off-by: Paul Belanger --- modules/openstack_project/manifests/server.pp | 4 ++++ modules/openstack_project/manifests/template.pp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index 439a7d9434..03695ad310 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -20,6 +20,10 @@ class openstack_project::server ( ) { include openstack_project::params + class { 'timezone': + timezone => 'Etc/UTC', + } + if $::osfamily == 'Debian' { # Purge and augment existing /etc/apt/sources.list if requested, and make # sure apt-get update is run before any packages are installed diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index 65e664ec62..9c5d42f868 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -54,10 +54,6 @@ class openstack_project::template ( snmp_v6hosts => $snmp_v6hosts, } - class { 'timezone': - timezone => 'Etc/UTC', - } - class {'openstack_project::users_install': install_users => $install_users }