Merge branch '110-update-vagrant-boxes-used-during-acceptance-tests' into 'master'

Resolve "update vagrant boxes used during acceptance tests"

Closes #110

See merge request !110

spec/acceptance/nodesets/default.yml

@@ -8,7 +8,7 @@ HOSTS:
     platform: el-7-x86_64
     hypervisor: vagrant
     box: centos/7
-    box_version: 1809.01
+    box_version: 1905.1
     box_check_update: false
     vagrant_memsize: 2048
     vagrant_cpus: 2
@@ -19,7 +19,7 @@ HOSTS:
     platform: el-7-x86_64
     hypervisor: vagrant
     box: centos/7
-    box_version: 1809.01
+    box_version: 1905.1
     box_check_update: false
     vagrant_memsize: 2048
     vagrant_cpus: 2
@@ -29,7 +29,7 @@ HOSTS:
     platform: ubuntu-1804-amd64
     hypervisor: vagrant
     box: ubuntu/bionic64
-    box_version: 20191114.0.0
+    box_version: 20200116.1.0
     box_check_update: false
     vagrant_memsize: 1024
 

spec/spec_helper_acceptance.rb

@@ -25,6 +25,12 @@ RSpec.configure do |c|
         package { 'git':
           ensure => present,
         }
+        # with nss 3.36.0 we can have trouble with CA failing to start
+        if $facts['os']['family'] == 'RedHat' {
+          package { 'nss':
+            ensure => latest,
+          }
+        }
       EOS
 
       apply_manifest_on(host, pp, catch_failures: true)
@@ -50,17 +56,17 @@ RSpec.configure do |c|
     hosts_as('replica').each do |replica|
       ip_replica = fact_on('replica', 'networking.interfaces.eth1.ip')
       pp = <<-EOS
-         exec { 'set replica /etc/hosts':
-           path     => '/bin/',
-           command  => 'echo -e "127.0.0.1       ipa-server-2.example.lan ipa-server-2\n ::1     ip6-localhost ip6-loopback\n fe00::0 ip6-localnet\n ff00::0 ip6-mcastprefix\n ff02::1 ip6-allnodes\n ff02::2 ip6-allrouters\n\n #{ip_replica} ipa-server-2.example.lan ipa-server-2\n" > /etc/hosts',
-         }
-         class { 'resolv_conf':
-           nameservers => ['#{ip_master}'],
-         }
-         host {'ipa-server-1.example.lan':
-           ensure => present,
-           ip => '#{ip_master}',
-         }
+        exec { 'set replica /etc/hosts':
+          path     => '/bin/',
+          command  => 'echo -e "127.0.0.1       ipa-server-2.example.lan ipa-server-2\n ::1     ip6-localhost ip6-loopback\n fe00::0 ip6-localnet\n ff00::0 ip6-mcastprefix\n ff02::1 ip6-allnodes\n ff02::2 ip6-allrouters\n\n #{ip_replica} ipa-server-2.example.lan ipa-server-2\n" > /etc/hosts',
+        }
+        class { 'resolv_conf':
+          nameservers => ['#{ip_master}'],
+        }
+        host {'ipa-server-1.example.lan':
+          ensure => present,
+          ip => '#{ip_master}',
+        }
       EOS
 
       apply_manifest_on(replica, pp, catch_failures: true, debug: true)