Add Amazon Linux 2 support

Closes simp#93

.fixtures.yml

@@ -9,9 +9,9 @@ fixtures:
     autofs: https://github.com/simp/pupmod-simp-autofs.git
     concat: https://github.com/simp/puppetlabs-concat.git
     firewalld: https://github.com/simp/pupmod-voxpupuli-firewalld.git
-    haveged: https://github.com/simp/pupmod-simp-haveged.git
+    #haveged: https://github.com/simp/pupmod-simp-haveged.git
     iptables: https://github.com/simp/pupmod-simp-iptables.git
-    krb5: https://github.com/simp/pupmod-simp-krb5.git
+    #krb5: https://github.com/simp/pupmod-simp-krb5.git
     mount_core: https://github.com/simp/pupmod-puppetlabs-mount_core.git
     pki: https://github.com/simp/pupmod-simp-pki.git
     selinux_core: https://github.com/simp/pupmod-puppetlabs-selinux_core.git
@@ -28,3 +28,5 @@ fixtures:
       branch: simp-master
   symlinks:
     nfs: "#{source_dir}"
+    haveged: "#{source_dir}/../haveged"
+    krb5: "#{source_dir}/../krb5"

metadata.json

@@ -47,27 +47,33 @@
     "optional_dependencies": [
       {
         "name": "simp/autofs",
-        "version_requirement": ">= 6.2.1 < 8.0.0"
+        "version_requirement": ">= 7.1.1 < 8.0.0"
       },
       {
         "name": "simp/krb5",
-        "version_requirement": ">= 7.1.0 < 8.0.0"
+        "version_requirement": ">= 7.3.0 < 8.0.0"
       },
       {
         "name": "simp/iptables",
-        "version_requirement": ">= 6.4.0 < 7.0.0"
+        "version_requirement": ">= 6.6.1 < 7.0.0"
       },
       {
         "name": "simp/stunnel",
-        "version_requirement": ">= 6.6.0 < 7.0.0"
+        "version_requirement": ">= 6.7.1 < 7.0.0"
       },
       {
         "name": "simp/tcpwrappers",
-        "version_requirement": ">= 6.2.0 < 7.0.0"
+        "version_requirement": ">= 6.3.0 < 7.0.0"
       }
     ]
   },
   "operatingsystem_support": [
+    {
+      "operatingsystem": "Amazon",
+      "operatingsystemrelease": [
+        "2"
+      ]
+    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [

spec/acceptance/nodesets/amzn2.yml

@@ -0,0 +1,43 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  amzn2-server:
+    roles:
+      - default
+      - nfs_server
+      - nfs_server_and_client
+    platform: el-7-x86_64
+    box: gbailey/amzn2
+    hypervisor: <%= hypervisor %>
+
+  amzn2-client:
+    roles:
+      - nfs_client
+    platform: el-7-x86_64
+    box: gbailey/amzn2
+    hypervisor: <%= hypervisor %>
+
+  amzn2-alt-server:
+    roles:
+      - nfs_server
+      - nfs_server_and_client
+    platform: el-7-x86_64
+    box: gbailey/amzn2
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  vagrant_cpus: 2
+  type: aio
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    keepalive_maxcount: 60
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

spec/acceptance/nodesets/default.yml

@@ -27,18 +27,19 @@ HOSTS:
       - nfs_server
       - nfs_server_and_client
     platform: el-8-x86_64
-    box: generic/centos8
+    box: generic/centos8s
     hypervisor: <%= hypervisor %>
 
   el8-client:
     roles:
       - nfs_client
     platform: el-8-x86_64
-    box: generic/centos8
+    box: generic/centos8s
     hypervisor: <%= hypervisor %>
 
 CONFIG:
   log_level: verbose
+  vagrant_cpus: 2
   type: aio
   ssh:
     keepalive: true

spec/acceptance/nodesets/oel.yml

@@ -39,6 +39,7 @@ HOSTS:
 
 CONFIG:
   log_level: verbose
+  vagrant_cpus: 2
   type: aio
   ssh:
     keepalive: true