Replace hostname with networking.hostname

Author: smortex

manifests/params.pp

@@ -340,7 +340,7 @@
       $config_file         = '/etc/my.cnf'
       $includedir          = undef
       $datadir             = '/var/mysql'
-      $log_error           = "/var/mysql/${::hostname}.err"
+      $log_error           = "/var/mysql/${facts['networking']['hostname']}.err"
       $pidfile             = '/var/mysql/mysql.pid'
       $root_group          = 'wheel'
       $mysql_group         = '_mysql'

manifests/server/account_security.pp

@@ -28,9 +28,9 @@
         require => Anchor['mysql::server::end'],
     }
   }
-  if ($::fqdn != $::hostname) {
-    if ($::hostname != 'localhost') {
-      mysql_user { ["root@${::hostname}", "@${::hostname}"]:
+  if ($::fqdn != $facts['networking']['hostname']) {
+    if ($facts['networking']['hostname'] != 'localhost') {
+      mysql_user { ["root@${facts['networking']['hostname']}", "@${facts['networking']['hostname']}"]:
         ensure  => 'absent',
         require => Anchor['mysql::server::end'],
       }

spec/classes/mysql_server_account_security_spec.rb

@@ -15,7 +15,9 @@
         let(:facts) do
           facts.merge(root_home: '/root',
                       fqdn: 'myhost.mydomain',
-                      hostname: 'myhost')
+                      networking: {
+                        hostname: 'myhost'
+                      })
         end
 
         ['root@myhost.mydomain',
@@ -47,7 +49,9 @@
         let(:facts) do
           facts.merge(root_home: '/root',
                       fqdn: 'localhost',
-                      hostname: 'localhost')
+                      networking: {
+                        hostname: 'localhost'
+                      })
         end
 
         ['root@127.0.0.1',
@@ -66,7 +70,9 @@
         let(:facts) do
           facts.merge(root_home: '/root',
                       fqdn: 'localhost.localdomain',
-                      hostname: 'localhost')
+                      networking: {
+                        hostname: 'localhost'
+                      })
         end
 
         ['root@127.0.0.1',