From 8f02f2da7c1cc4682f37c01c9fbc2c8509b0d412 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sat, 24 Jun 2017 15:54:06 +0200
Subject: [PATCH] Fix beaker on xenial

Add a xenial nodeset and update the spec helper to install puppet 3 from
the Ubuntu repos instead of from puppetlabs. Also fix a linter error.

Change-Id: Iad0ceb85547747d6c5d16e93f024a59ffafc13f1
---
 manifests/server.pp                          |  2 +-
 spec/acceptance/nodesets/nodepool-xenial.yml | 10 ++++++++++
 spec/spec_helper_acceptance.rb               |  9 ++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 spec/acceptance/nodesets/nodepool-xenial.yml

diff --git a/manifests/server.pp b/manifests/server.pp
index b5b7f43..eff5773 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -19,13 +19,13 @@ class lpmqtt::server (
   $imap_username,
   $imap_hostname,
   $imap_password,
+  $mqtt_password,
   $imap_use_ssl = true,
   $imap_folder = 'INBOX',
   $imap_delete_old = false,
   $mqtt_hostname = 'firehose01.openstack.org',
   $topic = 'launchpad',
   $mqtt_username = 'infra',
-  $mqtt_password,
 ) {
   file { '/etc/lpmqtt.conf':
     ensure  => present,
diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
new file mode 100644
index 0000000..99dd318
--- /dev/null
+++ b/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
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 7a5efa1..002ab34 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,7 +2,14 @@ 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] }
+  # otherwise use the beaker helpers to install the yum.puppetlabs.com repo and puppet
+  r = on host, "which yum",  { :acceptable_exit_codes => [0,1] }
+  if r.exit_code == 0
+    install_puppet
+  end
+  add_platform_foss_defaults(host, 'unix')
 
   on host, "mkdir -p #{host['distmoduledir']}"
 end