Replace fqdn with networking.fqdn

Author: smortex

manifests/server/account_security.pp

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

spec/classes/mysql_server_account_security_spec.rb

@@ -14,8 +14,8 @@
       context 'with fqdn==myhost.mydomain' do
         let(:facts) do
           facts.merge(root_home: '/root',
-                      fqdn: 'myhost.mydomain',
                       networking: {
+                        fqdn: 'myhost.mydomain',
                         hostname: 'myhost'
                       })
         end
@@ -48,8 +48,8 @@
       context 'with fqdn==localhost' do
         let(:facts) do
           facts.merge(root_home: '/root',
-                      fqdn: 'localhost',
                       networking: {
+                        fqdn: 'localhost',
                         hostname: 'localhost'
                       })
         end
@@ -69,8 +69,8 @@
       context 'with fqdn==localhost.localdomain' do
         let(:facts) do
           facts.merge(root_home: '/root',
-                      fqdn: 'localhost.localdomain',
                       networking: {
+                        fqdn: 'localhost.localdomain',
                         hostname: 'localhost'
                       })
         end