Puppet style guide: neither class nor defined type names may contain dashes

refs #6842

.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

.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' ]: }

.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',
   }

.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',

.vagrant-puppet/modules/monitoring_plugins/manifests/init.pp

@@ -1,4 +1,4 @@
-class monitoring-plugins {
+class monitoring_plugins {
   include epel
 
   # nagios plugins from epel

.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' ]: }
 }

.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",

.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",