Merge "Fix beaker-rspec tests"

manifests/logserver.pp

@@ -115,10 +115,16 @@ class openstackci::logserver (
     }
   }
 
+  if ! defined(Package['libffi-dev']) {
+    package { 'libffi-dev':
+      ensure => 'present',
+    }
+  }
+
   package { 'keyring':
     ensure   => 'latest',
     provider => 'openstack_pip',
-    require  => [Package['libdbus-1-dev'], Package['libdbus-glib-1-dev'], Package['build-essential'], Package['python-dev']],
+    require  => [Package['libdbus-1-dev'], Package['libdbus-glib-1-dev'], Package['build-essential'], Package['python-dev'], Package['libffi-dev']],
   }
 
   vcsrepo { '/opt/os-loganalyze':

spec/acceptance/nodesets/nodepool-xenial.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-16.04-amd64:
+    roles:
+      - master
+    platform: ubuntu-16.04-amd64
+    hypervisor: none
+    ip: 127.0.0.1
+CONFIG:
+  type: foss
+  set_env: false

spec/spec_helper_acceptance.rb

@@ -2,7 +2,10 @@ require 'beaker-rspec'
 
 hosts.each do |host|
 
-  install_puppet
+  # puppet 3 isn't available from apt.puppetlabs.com so install it from the Xenial repos
+  on host, "which apt-get && apt-get install puppet -y", { :acceptable_exit_codes => [0,1] }
+  on host, "which yum && yum install puppet -y", { :acceptable_exit_codes => [0,1] }
+  add_platform_foss_defaults(host, 'unix')
 
   on host, "mkdir -p #{host['distmoduledir']}"
 end