From af78b156c5418d1e67faed4635019dcef0da9cac Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 5 Jun 2017 19:07:51 -0300 Subject: Changes for puppet 4 compatibility --- manifests/kvm/manager/instance.pp | 2 +- manifests/openvpn/host_base.pp | 4 ++-- manifests/openvpn/server.pp | 2 +- manifests/vserver/host.pp | 16 ++++++++-------- manifests/vserver/instance.pp | 6 +++--- manifests/vserver/interface.pp | 8 ++++---- manifests/vserver/rlimit.pp | 6 +++--- manifests/vserver/sched.pp | 2 +- manifests/xen/dom0/debian.pp | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/manifests/kvm/manager/instance.pp b/manifests/kvm/manager/instance.pp index 4957645..621a3ca 100644 --- a/manifests/kvm/manager/instance.pp +++ b/manifests/kvm/manager/instance.pp @@ -29,7 +29,7 @@ define virtual::kvm::manager::instance( ensure => present, owner => root, group => root, - mode => 0644, + mode => '0644', content => template('virtual/kvm_creator.rules.erb'), } } diff --git a/manifests/openvpn/host_base.pp b/manifests/openvpn/host_base.pp index 072a8a7..305118b 100644 --- a/manifests/openvpn/host_base.pp +++ b/manifests/openvpn/host_base.pp @@ -2,9 +2,9 @@ class virtual::openvpn::host_base inherits virtual::openvpn::base { file { "/var/lib/puppet/modules/virtual/openvpn/create_interface": source => "puppet:///modules/virtual/create_openvpn_interface", - mode => 0755, owner => root, group => 0; + mode => '0755', owner => root, group => 0; "/var/lib/puppet/modules/virtual/openvpn/destroy_interface": source => "puppet:///modules/virtual/destroy_openvpn_interface", - mode => 0755, owner => root, group => 0; + mode => '0755', owner => root, group => 0; } } diff --git a/manifests/openvpn/server.pp b/manifests/openvpn/server.pp index b31f80b..b0f6048 100644 --- a/manifests/openvpn/server.pp +++ b/manifests/openvpn/server.pp @@ -4,7 +4,7 @@ define virtual::openvpn::server($config) { file { "/etc/openvpn/${name}.conf": ensure => present, content => $config, - mode => 0644, owner => root, group => 0, + mode => '0644', owner => root, group => 0, notify => Service['openvpn']; } } diff --git a/manifests/vserver/host.pp b/manifests/vserver/host.pp index 081fd07..29c1ce9 100644 --- a/manifests/vserver/host.pp +++ b/manifests/vserver/host.pp @@ -27,14 +27,14 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") { "/etc/vservers/local-interfaces": ensure => directory, - mode => 0755, + mode => '0755', owner => root, group => root, require => File["/etc/vservers"]; "/usr/local/bin/build_vserver": source => "puppet:///modules/virtual/vserver/build_vserver", - mode => 0755, + mode => '0755', owner => root, group => root, require => [ Package['util-vserver'], Package[debootstrap]]; @@ -45,7 +45,7 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") { "$vdirbase": ensure => directory, - mode => 000, + mode => '000', owner => root, group => root; @@ -53,7 +53,7 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") { # but i'm commenting this out until we learn how to properly use in case we want to use it. #"/etc/cron.daily/vserver-hashify": # source => "puppet:///virtual/hashify.cron.daily", - # mode => 0755, owner => root, group => root; + # mode => '0755', owner => root, group => root; } # remove dummy interfaces on the host @@ -67,7 +67,7 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") { file { "/etc/modprobe.d/local-dummy": ensure => absent, - mode => 0644, owner => root, group => root; + mode => '0644', owner => root, group => root; } # Setup some plugins if munin is enabled in the system @@ -77,19 +77,19 @@ class virtual::vserver::host($vdirbase = "/var/lib/vservers") { file { "/usr/local/share/munin-plugins/vserver_resources": source => "puppet:///modules/virtual/munin/vserver_resources", - mode => 0755, + mode => '0755', owner => root, group => root; "/usr/local/share/munin-plugins/vserver_cpu_": source => "puppet:///modules/virtual/munin/vserver_cpu_", - mode => 0755, + mode => '0755', owner => root, group => root; "/usr/local/share/munin-plugins/vserver_loadavg": source => "puppet:///modules/virtual/munin/vserver_loadavg", - mode => 0755, + mode => '0755', owner => root, group => root; } diff --git a/manifests/vserver/instance.pp b/manifests/vserver/instance.pp index 04cb06d..a994d1c 100644 --- a/manifests/vserver/instance.pp +++ b/manifests/vserver/instance.pp @@ -36,14 +36,14 @@ define virtual::vserver::instance( file { "/etc/vservers/${vs_name}/rlimits": ensure => directory, - mode => 0755, + mode => '0755', owner => root, group => root, require => Exec["vserver_instance_${vs_name}"], } file { "/etc/vservers/${vs_name}/rlimits/rss.hard": - mode => 0644, + mode => '0644', owner => root, group => root, content => template("virtual/rss.hard.erb"), @@ -58,7 +58,7 @@ define virtual::vserver::instance( } file { "/etc/vservers/${vs_name}/rlimits/rss.soft": - mode => 0644, + mode => '0644', owner => root, group => root, content => template("virtual/rss.soft.erb"), diff --git a/manifests/vserver/interface.pp b/manifests/vserver/interface.pp index 82a2c9c..7054848 100644 --- a/manifests/vserver/interface.pp +++ b/manifests/vserver/interface.pp @@ -6,17 +6,17 @@ define virtual::vserver::interface($prefix = 24, $dev = '') { file { "/etc/vservers/local-interfaces/${name}": ensure => directory, - mode => 0755, + mode => '0755', owner => root, group => root; "/etc/vservers/local-interfaces/${name}/ip": content => "${name}\n", - mode => 0644, + mode => '0644', owner => root, group => root; "/etc/vservers/local-interfaces/${name}/prefix": content => "${prefix}\n", - mode => 0644, + mode => '0644', owner => root, group => root; } @@ -26,7 +26,7 @@ define virtual::vserver::interface($prefix = 24, $dev = '') { file { "/etc/vservers/local-interfaces/${name}/nodev": ensure => present, - mode => 0644, + mode => '0644', owner => root, group => root; "/etc/vservers/local-interfaces/${name}/dev": diff --git a/manifests/vserver/rlimit.pp b/manifests/vserver/rlimit.pp index 0369750..ed1918b 100644 --- a/manifests/vserver/rlimit.pp +++ b/manifests/vserver/rlimit.pp @@ -7,7 +7,7 @@ define virtual::vserver::rlimit( $ensure = present ) { file { "/etc/vservers/${vserver}/rlimits/$limit.soft": - mode => 0644, + mode => '0644', owner => root, group => root, content => "$soft\n", @@ -20,7 +20,7 @@ define virtual::vserver::rlimit( } file { "/etc/vservers/${vserver}/rlimits/$limit.hard": - mode => 0644, + mode => '0644', owner => root, group => root, content => "$hard\n", @@ -33,7 +33,7 @@ define virtual::vserver::rlimit( } file { "/etc/vservers/${vserver}/rlimits/$limit.min": - mode => 0644, + mode => '0644', owner => root, group => root, content => "$min\n", diff --git a/manifests/vserver/sched.pp b/manifests/vserver/sched.pp index b0d12bd..dbd251e 100644 --- a/manifests/vserver/sched.pp +++ b/manifests/vserver/sched.pp @@ -15,7 +15,7 @@ define virtual::vserver::sched( ensure => directory, owner => root, group => root, - mode => 0755, + mode => '0755', } case $fill_rate { diff --git a/manifests/xen/dom0/debian.pp b/manifests/xen/dom0/debian.pp index 56ec52c..9c6d171 100644 --- a/manifests/xen/dom0/debian.pp +++ b/manifests/xen/dom0/debian.pp @@ -20,7 +20,7 @@ class virtual::xen::dom0::debian inherits xen::dom0::base { file { "/etc/xen-tools/xen-tools.conf": - owner => root, group => 0, mode => 0644, + owner => root, group => 0, mode => '0644', content => template("site_virtual/xen/${operatingsystem}/${lsbdistcodename}/xen-tools.conf.erb"), require => Package['xen-tools']; } -- cgit v1.2.3