Add Puppet 4 Support

.travis.yml

@@ -3,9 +3,13 @@ rvm:
 script:
 - bundle exec rake lint
 - bundle exec rake validate
-- BEAKER_set=openstack-ubuntu BEAKER_debug=yes bundle exec rake beaker
+- bundle exec rake beaker
 env:
+  matrix:
+  - PUPPET_INSTALL_TYPE=foss BEAKER_set=openstack-ubuntu-trusty
+  - PUPPET_INSTALL_TYPE=agent BEAKER_set=openstack-ubuntu-trusty
   global:
+  - BEAKER_debug=yes
   - secure: soaLCzoLjkyTSUk3SVwe8jDB3PRDoLCsQj8hTGvjWMYCs6ys7OtATOhbD+TjkmN2UR5oFTj9s3ATlXfJxRtYfJybXs4wGYiBlX6GeOPP2MIrCVjh/3vRcujQvSR8wQ0k7TdYb4/UJ/liKw4NmwNQ2/xKivMj4DxyIdA84H/vvLs+I+RtTHbueHuPbH254a2EPCyECA1ro5cvZK/p4kYoMJeYtRHfX1Uex/uNggrYTEmDXRqPdndrGxQXCGCLPxT3bFw6cZUNaW5ICzn6Mq2D4CImmb2jI+GL/OG5oJQXaFm0fIKUq9dvqkoXmg+Ggac2LVIwfpKR73R53loCgmHygijZhlzJjQ/ySBNyu3iflvszMYBN3nls6+en430KF5Y9R0XvFUarYaS8GM/74p81usLDNnbLRKQj/bBNKKIVdG6fSRlqd54a2VADuo1v+W4qa0R5zaOgr3W7iOK2MWFtu438AkoXjm6qtRow8ABYT4OR6e80Ie0MmYPjph+DNVYLEu09lYnv6nqLoVOJixnydy2DTWCIitvZ0TCjei4JcXhAffN+Fhkrkuro3TZywrM8dq6wwopaYw2hmd/OJyUY9uFDry2Js3vEUvEXX8LOGhQChhdo9zDR+oZhPC8VItmuQB4Z0eoLkH8o7wPhQ3gVeW4Aqf/PMC0pzekdr65p/qE=
   - secure: NrwiJ8w3pgG3pe8pJhXCDR6iK+4jMQERqRgZ55HQYgB6dqL2G2RdaSw5mGr8UYo9g0toYXH1w2jUtB6SaSdGFsNHvbtPnH1Jwf+hxzYwYyatksWXGYx2prA0J8CGb4ElpDSAsmJYu+sfO+9kwKBI7N+UnCtsZrfHsciPbi/hehPFUQ5g+Spp6bUYCKuB3z7nxvX1NfcPqqPp3b8EH7iAX3sptk3g66aYdayqZbB+R+n1gS7JaQxEPuR8rSzmSfn/EWyeb/N2awiPxzmqqg6kek/GeeJhRu1po2v6UvMTWOBBrLY9otxbPPFQL12j0NZRRpk8geqasq9czusY7K57BAWTefZBymejWBJNbytrrx+3zeTDCpTTQcQYtmrXuV9NELbto1EeWbU2Vhop3v3K9vOYo1ZazBzeKcBZlkP9+QKdehovzmjdtoq4Fl06tMvEHLnGjCC/lVoB/ZN37aNdA/VrFQL28LLb17CS5g3mjHk4jb7+wlodM6sE3S0hl5LqW1pm4tbBfwkKxREEUdDJYsbk4ATtMg5UdHF/u9IkF4BKxRPCZfROk5qLtHqvinjwoEOQK3QCSdC3tBzDBHAPze0rMFeHNL1ITEzqDCPEw5qCq9udz59u5LBslA1LKMQpp5GYiI7V2QUR+ofrICy2+hxfzPPFAWFxI6eFaIMo18I=
   - secure: mi37gyZkQOEwVRdjW0UA6qPRnlS+1U/hjgAXSCN7j/4RMkUllrhwV64VQRZH4IIzhRQm9nUhLegZtHmqFJ1YoDRsWUWbV23W+aLQZox6+bUCyhQO+63YMRAXOCXPbKRfqDoDBO138IVEFfRUbzbY+NiR9oKv6UHegu6EJFHD5LNCe8MSVFRqymAfLU4lI+TaZJ/rmogh/gmPhyDWZQw7b4oav/0I93nbZnkFnZtOlUXE9aYnxZEk0ca/M1GL8ka1H+5+5ZuU/ESXMcAI1kerFTbsMIo6Vyr6DU3gYg7D7LIzJ6fv4h6P3/1xfkGIBV2jAcU/T87S3StKHhtvnJdIdlqfFb63+/gORHV/yACqTj6998gx8n8HQqWVL0DBCqo4gNQkROo0M81f5X/EwG0StF1GKCu8EN2iuKSCRtl8rX7KxoRZpAL72+Ib/vT4VIe+SX6WucDyDOm4beSNXGTxMBgRqmLOZRhj+4MjPdnf4S1YOkHYBVb8ulVTu9WfI8Ur9bFEF3NASCjHMXMhuU1y2Mfex04ncfhe9VRR6K8mOwlqemii5dwIKTR9Od9ybw46pu/vo7fIzvbT87pfXp0YdskUAB3wh1Ckm5A78JdYrNtU13pkFwW6E/Ng/CXr3GjQ7/5ujs442UUwSm4fqs75xl1liCklJN5q7SBC+C4Fks8=

manifests/web.pp

@@ -12,6 +12,12 @@
     include ::apache::mod::php
     include ::apache::mod::ssl
 
+    if versioncmp($::puppetversion, '4.0.0') >= 0 {
+      $_ssldir = '/etc/puppetlabs/puppet/ssl'
+    } else {
+      $_ssldir = '/var/lib/puppet/ssl'
+    }
+
     apache::vhost { 'nfsen':
       servername      => $::fqdn,
       port            => 80,
@@ -25,10 +31,10 @@
       port              => 443,
       docroot           => '/var/www/html',
       ssl               => true,
-      ssl_cert          => "/var/lib/puppet/ssl/certs/${::fqdn}.pem",
-      ssl_key           => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
-      ssl_ca            => '/var/lib/puppet/ssl/certs/ca.pem',
-      ssl_crl           => '/var/lib/puppet/ssl/crl.pem',
+      ssl_cert          => "${_ssldir}/certs/${::fqdn}.pem",
+      ssl_key           => "${_ssldir}/private_keys/${::fqdn}.pem",
+      ssl_ca            => "${_ssldir}/certs/ca.pem",
+      ssl_crl           => "${_ssldir}/crl.pem",
       ssl_verify_client => $::nfsen::web_ssl_verify_client,
       ssl_verify_depth  => $::nfsen::web_ssl_verify_depth,
     } ->

metadata.json

@@ -20,6 +20,6 @@
     { "name": "puppetlabs/vcsrepo", "version_requirement": ">=1.3.0 < 2.0.0" }
   ],
   "requirements": [
-    { "name": "puppet", "version_requirement": ">= 3.8.0 < 4.0.0" }
+    { "name": "puppet", "version_requirement": ">= 3.8.0 < 5.0.0" }
   ]
 }

spec/acceptance/default_spec.rb

@@ -10,10 +10,13 @@
       shell('ipcmk -S 1')
       # Create a CA and certificate for the web server
       shell('puppet cert generate $(facter fqdn)')
+
+      hiera_path = ENV['PUPPET_INSTALL_TYPE'] == 'agent' ? '/etc/puppetlabs/code/environments/production/hieradata' : '/var/lib/hiera'
+
       # Add in an MPM module for mod_php
-      shell('echo "apache::mpm_module: \'prefork\'" >> /var/lib/hiera/common.yaml')
+      shell("echo apache::mpm_module: 'prefork' >> #{hiera_path}/common.yaml")
       # Disable the default vhost
-      shell('echo "apache::default_vhost: false" >> /var/lib/hiera/common.yaml')
+      shell("echo apache::default_vhost: false >> #{hiera_path}/common.yaml")
 
       pp = <<-EOS
         Exec {