From 809b7149c45775ca18516ffeb5eaf96296ed73da Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 2 Sep 2014 12:11:36 +0200 Subject: [PATCH] Puppet style guide: neither class nor defined type names may contain dashes refs #6842 --- .vagrant-puppet/manifests/default.pp | 8 ++++---- .vagrant-puppet/modules/icinga2/manifests/init.pp | 4 ++-- .../etc/icinga2/features-available/ido-mysql.conf | 0 .../{icinga2-mysql => icinga2_mysql}/manifests/init.pp | 8 ++++---- .../manifests/init.pp | 4 ++-- .../manifests/init.pp | 2 +- .../files/etc/icinga2/conf.d/commands.conf | 0 .../files/etc/icinga2/conf.d/test-config.conf | 0 .../files/etc/icinga2/constants.conf | 0 .../{icinga2-dev => icinga2_dev}/manifests/init.pp | 10 +++++----- .../{icinga-mysql => icinga_mysql}/manifests/init.pp | 2 +- .../{icinga-pgsql => icinga_pgsql}/manifests/init.pp | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) rename .vagrant-puppet/modules/{icinga2-mysql => icinga2_mysql}/files/etc/icinga2/features-available/ido-mysql.conf (100%) rename .vagrant-puppet/modules/{icinga2-mysql => icinga2_mysql}/manifests/init.pp (80%) rename .vagrant-puppet/modules/{icinga-packages => icinga_packages}/manifests/init.pp (80%) rename .vagrant-puppet/modules/{monitoring-plugins => monitoring_plugins}/manifests/init.pp (83%) rename .vagrant-puppet/profiles/{icinga2-dev => icinga2_dev}/files/etc/icinga2/conf.d/commands.conf (100%) rename .vagrant-puppet/profiles/{icinga2-dev => icinga2_dev}/files/etc/icinga2/conf.d/test-config.conf (100%) rename .vagrant-puppet/profiles/{icinga2-dev => icinga2_dev}/files/etc/icinga2/constants.conf (100%) rename .vagrant-puppet/profiles/{icinga2-dev => icinga2_dev}/manifests/init.pp (50%) rename .vagrant-puppet/profiles/{icinga-mysql => icinga_mysql}/manifests/init.pp (98%) rename .vagrant-puppet/profiles/{icinga-pgsql => icinga_pgsql}/manifests/init.pp (98%) diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 6dbe04033..f2516f6d0 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -5,7 +5,7 @@ include openldap include icingaweb2 include nodejs -include profile::icinga2-dev +include icinga2_dev Exec { path => '/bin:/usr/bin:/sbin:/usr/sbin' } @@ -16,8 +16,8 @@ $phantomjsVersion = '1.9.1' $casperjsVersion = '1.0.2' class { [ - 'icinga-mysql', - 'icinga-pgsql' ]: + 'icinga_mysql', + 'icinga_pgsql' ]: icingaVersion => $icingaVersion, } @@ -164,7 +164,7 @@ exec { 'install nagios-plugins-all': unless => 'rpm -qa | grep nagios-plugins-all', require => [ Class['epel'], Package['icinga2'] ], } -# vs include monitoring-plugins (epel is disabled) +# vs include monitoring_plugins (epel is disabled) # icinga 2 classic ui diff --git a/.vagrant-puppet/modules/icinga2/manifests/init.pp b/.vagrant-puppet/modules/icinga2/manifests/init.pp index 364ea3632..cd072bcc0 100644 --- a/.vagrant-puppet/modules/icinga2/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga2/manifests/init.pp @@ -1,5 +1,5 @@ class icinga2 { - include icinga-packages + include icinga_packages service { 'icinga2': ensure => running, @@ -10,7 +10,7 @@ class icinga2 { package { [ 'icinga2', 'icinga2-doc', 'icinga2-debuginfo' ]: ensure => latest, - require => Class['icinga-packages'], + require => Class['icinga_packages'], } icinga2::feature { [ 'statusdata', 'command', 'compatlog' ]: } diff --git a/.vagrant-puppet/modules/icinga2-mysql/files/etc/icinga2/features-available/ido-mysql.conf b/.vagrant-puppet/modules/icinga2_mysql/files/etc/icinga2/features-available/ido-mysql.conf similarity index 100% rename from .vagrant-puppet/modules/icinga2-mysql/files/etc/icinga2/features-available/ido-mysql.conf rename to .vagrant-puppet/modules/icinga2_mysql/files/etc/icinga2/features-available/ido-mysql.conf diff --git a/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp b/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp similarity index 80% rename from .vagrant-puppet/modules/icinga2-mysql/manifests/init.pp rename to .vagrant-puppet/modules/icinga2_mysql/manifests/init.pp index 0e481eb1c..4b02908f0 100644 --- a/.vagrant-puppet/modules/icinga2-mysql/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga2_mysql/manifests/init.pp @@ -1,9 +1,9 @@ -class icinga2-mysql { - include icinga-packages +class icinga2_mysql { + include icinga_packages package { 'icinga2-ido-mysql': ensure => latest, - require => Class['icinga-packages'], + require => Class['icinga_packages'], } mysql::database::populate { 'icinga2': @@ -15,7 +15,7 @@ class icinga2-mysql { } file { '/etc/icinga2/features-available/ido-mysql.conf': - source => 'puppet:///modules/icinga2-mysql/etc/icinga2/features-available/ido-mysql.conf', + source => 'puppet:///modules/icinga2_mysql/etc/icinga2/features-available/ido-mysql.conf', owner => 'icinga', group => 'icinga', } diff --git a/.vagrant-puppet/modules/icinga-packages/manifests/init.pp b/.vagrant-puppet/modules/icinga_packages/manifests/init.pp similarity index 80% rename from .vagrant-puppet/modules/icinga-packages/manifests/init.pp rename to .vagrant-puppet/modules/icinga_packages/manifests/init.pp index e249364f7..0695996ea 100644 --- a/.vagrant-puppet/modules/icinga-packages/manifests/init.pp +++ b/.vagrant-puppet/modules/icinga_packages/manifests/init.pp @@ -1,5 +1,5 @@ -class icinga-packages { - yumrepo { 'icinga-packages': +class icinga_packages { + yumrepo { 'icinga_packages': baseurl => "http://packages.icinga.org/epel/6/snapshot/", enabled => '1', gpgcheck => '1', diff --git a/.vagrant-puppet/modules/monitoring-plugins/manifests/init.pp b/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp similarity index 83% rename from .vagrant-puppet/modules/monitoring-plugins/manifests/init.pp rename to .vagrant-puppet/modules/monitoring_plugins/manifests/init.pp index 6dc7be09d..0cf4b897b 100644 --- a/.vagrant-puppet/modules/monitoring-plugins/manifests/init.pp +++ b/.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp @@ -1,4 +1,4 @@ -class monitoring-plugins { +class monitoring_plugins { include epel # nagios plugins from epel diff --git a/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/commands.conf b/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/commands.conf similarity index 100% rename from .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/commands.conf rename to .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/commands.conf diff --git a/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/test-config.conf b/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/test-config.conf similarity index 100% rename from .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/test-config.conf rename to .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/test-config.conf diff --git a/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/constants.conf b/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/constants.conf similarity index 100% rename from .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/constants.conf rename to .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/constants.conf diff --git a/.vagrant-puppet/profiles/icinga2-dev/manifests/init.pp b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp similarity index 50% rename from .vagrant-puppet/profiles/icinga2-dev/manifests/init.pp rename to .vagrant-puppet/profiles/icinga2_dev/manifests/init.pp index f12757dee..611d0f116 100644 --- a/.vagrant-puppet/profiles/icinga2-dev/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga2_dev/manifests/init.pp @@ -1,16 +1,16 @@ -class icinga2-dev { +class icinga2_dev { include icinga2 - include icinga2-mysql + include icinga2_mysql - define icinga2-config { + define icinga2_config { $path = "/etc/icinga2/${name}.conf" file { $path: - source => "puppet:///modules/icinga2-dev${path}", + source => "puppet:///modules/icinga2_dev${path}", owner => 'icinga', group => 'icinga', require => Class['icinga2'], } } - icinga2-config { [ 'conf.d/test-config', 'conf.d/commands', 'constants' ]: } + icinga2_config { [ 'conf.d/test-config', 'conf.d/commands', 'constants' ]: } } diff --git a/.vagrant-puppet/profiles/icinga-mysql/manifests/init.pp b/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp similarity index 98% rename from .vagrant-puppet/profiles/icinga-mysql/manifests/init.pp rename to .vagrant-puppet/profiles/icinga_mysql/manifests/init.pp index 5de78faad..6d393e4a9 100644 --- a/.vagrant-puppet/profiles/icinga-mysql/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga_mysql/manifests/init.pp @@ -1,4 +1,4 @@ -class icinga-mysql ($icingaVersion) { +class icinga_mysql ($icingaVersion) { cmmi { 'icinga-mysql': url => "https://github.com/Icinga/icinga-core/releases/download/v${icingaVersion}/icinga-${icingaVersion}.tar.gz", output => "icinga-${icingaVersion}.tar.gz", diff --git a/.vagrant-puppet/profiles/icinga-pgsql/manifests/init.pp b/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp similarity index 98% rename from .vagrant-puppet/profiles/icinga-pgsql/manifests/init.pp rename to .vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp index 266ca3561..37d4cd70c 100644 --- a/.vagrant-puppet/profiles/icinga-pgsql/manifests/init.pp +++ b/.vagrant-puppet/profiles/icinga_pgsql/manifests/init.pp @@ -1,4 +1,4 @@ -class icinga-pgsql ($icingaVersion) { +class icinga_pgsql ($icingaVersion) { cmmi { 'icinga-pgsql': url => "https://github.com/Icinga/icinga-core/releases/download/v${icingaVersion}/icinga-${icingaVersion}.tar.gz", output => "icinga-${icingaVersion}.tar.gz",