Merge branch 'test' into 'production'

Test

See merge request !28

manifests/firewall.pp

-class aim_control::firewall{
+class aim_control::firewall {
   ::server_firewall::constricto_chain{ 'skadereg': }
   ::server_firewall::rules_file { '55-permit-skadereg.rules':
     content => template("${module_name}/55-permit-skadereg.rules.erb"),
     require => ::Server_firewall::Constricto_chain['skadereg'],
   }
-}
\ No newline at end of file
+}

manifests/init.pp

@@ -43,7 +43,7 @@ class aim_control(
   }
 
   file { '/etc/sudoers.d/02-serious_sam' :
-    ensure  => 'present',
+    ensure  => 'file',
     owner   => 'root',
     mode    => '0660',
     content => 'samla949 ALL=(ALL) NOPASSWD: ALL',
@@ -60,15 +60,15 @@ class aim_control(
     ],
   }
 
-  include ::aim_control::firewall
-  include ::apache
-  include ::aim_control::remirepo
+  include aim_control::firewall
+  include apache
+  include aim_control::remirepo
 
-  class { '::apache::mod::php':
+  class { 'apache::mod::php':
     package_name => 'php74',
     php_version  => '7',
   }
-  include ::apache::mod::rewrite
+  include apache::mod::rewrite
 
   package {
     'php74-php-pdo':
@@ -89,7 +89,7 @@ class aim_control(
     before => Service['httpd'],
   }
 
-  include ::certdist
+  include certdist
 
   $cert = "/etc/pki/tls/certs/cert-${facts['networking']['fqdn']}.pem"
   $chain = "/etc/pki/tls/certs/chain-${facts['networking']['fqdn']}.pem"
@@ -172,7 +172,7 @@ class aim_control(
 
   $db_name = 'homestead'
 
-  class { '::mysql::server':
+  class { 'mysql::server':
     root_password    => $mysql_password,
     databases        => {
       $db_name => {
@@ -212,7 +212,7 @@ class aim_control(
     }
   }
 
-  class { '::mysql::server::backup':
+  class { 'mysql::server::backup':
     backupuser     => 'backupuser',
     backuppassword => $mysql_backup_password,
     backupdir      => '/root/mysql_backups',

metadata.json

@@ -3,12 +3,65 @@
   "version": "0.0.0",
   "author": "LiU",
   "summary": "Puppet module for AIM Control",
-  "license": "TBD",
+  "license": "Apache-2.0",
   "source": "https://gitlab.liu.se/liu-puppet-modules/aim_control/tree/production",
   "project_page": "https://gitlab.liu.se/liu-puppet-modules/aim_control",
   "issues_url": "https://gitlab.liu.se/liu-puppet-modules/aim_control/issues",
   "dependencies": [
-    { "name": "puppetlabs-stdlib", "version_requirement": ">= 1.0.0" }
+
   ],
-  "data_provider": null
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "8"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "10"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "18.04"
+      ]
+    },
+    {
+      "operatingsystem": "windows",
+      "operatingsystemrelease": [
+        "2019",
+        "10"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 6.21.0 < 8.0.0"
+    }
+  ],
+  "pdk-version": "2.1.0",
+  "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
+  "template-ref": "heads/liu-0-g8fb0f81"
 }

spec/classes/aim_control_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'aim_control' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile }
+    end
+  end
+end

spec/classes/firewall_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'aim_control::firewall' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile }
+    end
+  end
+end

spec/classes/remirepo_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'aim_control::remirepo' do
+  on_supported_os.each do |os, os_facts|
+    context "on #{os}" do
+      let(:facts) { os_facts }
+
+      it { is_expected.to compile }
+    end
+  end
+end

spec/default_facts.yml

+# Use default_module_facts.yml for module specific facts.
+#
+# Facts specified here will override the values provided by rspec-puppet-facts.
+---
+ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"

spec/spec_helper.rb

+# frozen_string_literal: true
+
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
+
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+
+require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
+
+# LiU - Default to UTF-8 encoding
+Encoding.default_external = Encoding::UTF_8
+
+include RspecPuppetFacts
+
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
+
+default_fact_files = [
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
+]
+
+default_fact_files.each do |f|
+  next unless File.exist?(f) && File.readable?(f) && File.size?(f)
+
+  begin
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+  rescue => e
+    RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
+  end
+end
+
+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value
+end
+
+RSpec.configure do |c|
+  c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+    Puppet.settings[:strict_variables] = true
+  end
+  c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+  c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
+  end
+end
+
+# Ensures that a module is defined
+# @param module_name Name of the module
+def ensure_module_defined(module_name)
+  module_name.split('::').reduce(Object) do |last_module, next_module|
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
+    last_module.const_get(next_module, false)
+  end
+end
+
+# 'spec_overrides' from sync.yml will appear below this line

tests/init.pp

@@ -9,4 +9,4 @@
 # Learn more about module testing here:
 # https://docs.puppetlabs.com/guides/tests_smoke.html
 #
-include ::skadereg
+include skadereg