Fix legacy facts

voxpupuli · Jan 7, 2020 · 0b7bf58 · 0b7bf58
1 parent 4c73c1e
commit 0b7bf58
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -459,7 +459,7 @@ Data type: `Variant[String, Array[String]]`
 
 The IP or hostname of the openvpn server service.
 
-Default value: $::fqdn
+Default value: $facts['networking']['fqdn']
 
 ##### `cipher`
 
@@ -1004,7 +1004,7 @@ Data type: `String`
 
 Interface for openvpn to bind to.
 
-Default value: $facts['ipaddress_eth0']
+Default value: $facts['networking']['ip']
 
 ##### `logfile`
 

diff --git a/manifests/client.pp b/manifests/client.pp
@@ -55,7 +55,7 @@
   Boolean $persist_tun                                 = true,
   String $port                                         = '1194',
   Enum['tcp','udp'] $proto                             = 'tcp',
-  Variant[String, Array[String]] $remote_host          = $::fqdn,
+  Variant[String, Array[String]] $remote_host          = $facts['networking']['fqdn'],
   String $resolv_retry                                 = 'infinite',
   Enum['none', 'nointeract', 'interact'] $auth_retry   = 'none',
   String $verb                                         = '3',

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -3,7 +3,7 @@
 #
 class openvpn::config {
 
-  if $facts['osfamily'] == 'Debian' {
+  if $facts['os']['family'] == 'Debian' {
     concat { '/etc/default/openvpn':
       owner => root,
       group => 0,

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -153,7 +153,7 @@
   Optional[String] $group                                           = undef,
   Boolean $ipp                                                      = false,
   Boolean $duplicate_cn                                             = false,
-  String $local                                                     = $facts['ipaddress_eth0'],
+  String $local                                                     = $facts['networking']['ip'],
   Variant[Boolean, String] $logfile                                 = false,
   Boolean $manage_logfile_directory                                 = false,
   String[1] $logdirectory_user                                      = 'nobody',

diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
diff --git a/spec/defines/openvpn_server_spec.rb b/spec/defines/openvpn_server_spec.rb
@@ -447,8 +447,7 @@
       context 'with easyrsa 2.0' do
         let(:facts) do
           facts.merge(
-            easyrsa: '2.0',
-            ipaddress_eth0: '1.2.3.4'
+            easyrsa: '2.0'
           )
         end
 
@@ -598,7 +597,7 @@
           it { is_expected.not_to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^log\-append\s+test_server\/openvpn\.log$}) }
           it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^status\s+/var/log/openvpn/test_server-status\.log$}) }
           it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^dev\s+tun0$}) }
-          it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^local\s+1\.2\.3\.4$}) }
+          it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^local\s+10\.0\.2\.15$}) }
           it { is_expected.not_to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^ifconfig-pool-persist}) }
           it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^crl-verify\s+\/etc\/openvpn\/test_server\/crl.pem$}) }
           it { is_expected.not_to contain_schedule('renew crl.pem schedule on test_server') }
@@ -806,8 +805,7 @@
       context 'with easyrsa 3.0' do
         let(:facts) do
           facts.merge(
-            easyrsa: '3.0',
-            ipaddress_eth0: '1.2.3.4'
+            easyrsa: '3.0'
           )
         end