Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance

Change-Id: I5da845d841e22bf6a6312f5e8f2a01373595048e

Gemfile

@@ -14,6 +14,9 @@ group :development, :test do
   gem 'puppet-lint-numericvariable',          :require => 'false'
   gem 'json',                                 :require => 'false'
   gem 'r10k',                                 :require => 'false'
+  gem 'puppet-openstack_spec_helper',
+      :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+      :require => false
 end
 
 group :system_tests do

Rakefile

@@ -1,6 +1 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+require 'puppet-openstack_spec_helper/rake_tasks'

spec/spec_helper_acceptance.rb

@@ -1,26 +1 @@
-require 'beaker-rspec'
-
-hosts.each do |host|
-
-  install_puppet
-
-  on host, "mkdir -p #{host['distmoduledir']}"
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module
-    puppet_module_install(:source => proj_root, :module_name => 'monasca')
-    hosts.each do |host|
-      on host, puppet('module','install','stankevich/python'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
+require 'puppet-openstack_spec_helper/beaker_spec_helper'

tests/apiserver.pp

@@ -1 +1 @@
-include monasca::apiserver
+include ::monasca::apiserver

tests/init.pp

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

tests/storm.pp

@@ -1 +1 @@
-include monasca::storm
+include ::monasca::storm