Weekly sync of openstack master modules.

Update aodh to 1d2f1352137cdbb23b94e1c06b47088f20a9f560

1d2f1352137cdbb23b94e1c06b47088f20a9f560 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance

Change-Id: I1ca9da2eec3a0ee80ea750f0428f1dcf69ee71bd

Update ceilometer to 48d299bea89baa7446315b871cd2f506355e08d4

48d299bea89baa7446315b871cd2f506355e08d4 Merge "Set auth_region to $::os_service_default"
6efe275561fe579abd5b182488d10b7b8c946ec8 Merge "Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance"
b787d19d9ef18e3eabdf9af5758f37b6350f273f beaker: stop testing ceilometer-alarm
ae2c5f7939a9e0776197cd0f70bfc7ac73513eb2 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
2bf8cc7f27e4abd9be36be07eba7ae928ec39e28 Merge "Add rspec-puppet-facts to the spec_helper"
4e5dc348b44ddaccbba698372ca80678c4c385f6 Add rspec-puppet-facts to the spec_helper
540b456c86b45aff5c33313fa163b6ff2d99d8d8 Set auth_region to $::os_service_default

Change-Id: I451ff9fd83538cc592c9a161cec61078a348d0af

Update cinder to 01ce5f020f3cf82e24fed6f8b504823dc34d8af0

01ce5f020f3cf82e24fed6f8b504823dc34d8af0 Update readme
98529f74d69462cec87819d6b949ebd3efa58922 Merge "Update tests to leverage rspec-puppet-facts"
71421654853a5c3d8b5a55970f0fca0c95889cc8 Update tests to leverage rspec-puppet-facts
7655d9ae33d57b9c101d07ba899e096dd42eb382 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
688e2b08479522caccf83a3593f46b741d3bd750 Use openstack spec helper for spec defaults

Change-Id: Id750ce458de567795df6a3d226e102a5ff5cac84

Update glance to 67bd15682e318167e8b2e0f720b97b62806e7026

67bd15682e318167e8b2e0f720b97b62806e7026 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
b2aa99e0b895d2269c9c04e554a95ab902242157 Merge "Use openstack spec helper for spec defaults"
258b1905da379391eff6fd9c2dec03cf5a2f37bb Use openstack spec helper for spec defaults

Change-Id: I70a42d4bc3b9d3013de5175bf420baec6da54968

Update gnocchi to 60830a46c9876ed14ae5df666853cf611831c1f1

60830a46c9876ed14ae5df666853cf611831c1f1 Add rspec-puppet-facts to the spec_helper

Change-Id: Ic6913b16e9f518df518b68cd4570b4f2c95b2664

Update heat to 32a2b26507931dcfbbc9388ce1d876e06ae69ca6

32a2b26507931dcfbbc9388ce1d876e06ae69ca6 Merge "Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance"
f86240078440dc5b6962c2c6a1fa46a66c9bb554 Merge "Add type/provider for paste configs"
211a5047ba1c84ff67c2be13c10bbff6e474523d Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
019883ba1d0eaf3d5c2d34c86ced924f0f4a4123 Implement crontab to purge deleted data
28426bab0864e1eaa5dbdd23d01f1d9b072e2001 Add type/provider for paste configs

Change-Id: Ib918f48f69fdd10b6e02ed5e3b5147d697927813

Update horizon to 748c31eff2637cf16717d02a6ef25fb20a8d6d80

748c31eff2637cf16717d02a6ef25fb20a8d6d80 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
1e555328046f27908519230fc4a7c864287e3c1e Merge "Add rspec-puppet-facts to the spec_helper"
3c9b622396af980196042e8877bd683be92f885e Add rspec-puppet-facts to the spec_helper

Change-Id: I2d27c36d55a5b37024e97cde98e15ae939bacd6e

Update ironic to df772a1c606afcaf8e0d515ee413e36e38d0f28d

df772a1c606afcaf8e0d515ee413e36e38d0f28d Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance

Change-Id: I727488c75210d9bb74c36b68ffd704b0572765cb

Update keystone to b2ac15d113ef759f0c2d40e4836049938aa11a77

b2ac15d113ef759f0c2d40e4836049938aa11a77 Merge "Specify user and project domains for admin role"
4b0f5276d787d1702842cd977aa1aab1a3e06e96 Merge "Fix region association for endpoints."
3e50ac09ee7d7a55da087320a274605bd8b144a0 Fix region association for endpoints.
714062347efdf7c301615d534b4990d9f28e6f57 Merge "Hash domains by name"
19ee7b4a3c5e91a2d3840d4a9a7c5a42d88646dd Specify user and project domains for admin role
367f812476cec3f9d9287fdb8b1f45decf358f9f Hash domains by name

Change-Id: I669735414170a382e9c820b9c321a50235e36d2f

Update manila to 2813212f5177da261449c79c0ae000c3b3f28e2d

2813212f5177da261449c79c0ae000c3b3f28e2d Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
4da51bcece8a5c01eab3b0d668c0cb3a8479b1da Add rspec-puppet-facts to the spec_helper

Change-Id: Idc725fc9fca36fc94edd1e9e802245031d151ab1

Update neutron to 7cf01787ccaa4738d98e5346d09d6e500fbb359a

7cf01787ccaa4738d98e5346d09d6e500fbb359a Merge "add ipv6 options to neutron_subnet type"
466535c099fa8927ac82cc5cbde9bcef2e547a5d Merge "Adding amqp_durable_queues parameter to neutron configurations"
8e2beda585bf070a85002aeae5ce075211413afd Merge "Add api_paste type/provider for Neutron"
18c5cd33c1f3a15d89b01e93da02ab1c02e14bf2 Adding amqp_durable_queues parameter to neutron configurations
49029b2015f65edd26f1e1943adc5ec94911dcab Merge "Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance"
d8f14ec8420e12d85c0bcf074b9d04d6df16303d acceptance: enable lbaas service provider
1140ae26e3e713f4f7a9bb7677d74e9e3e772190 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
66eee63420297a013fb57ee488c571350cf5052a Merge "Correctly parse csv even with extra output."
92230f17da68a647852eb64cc7c5d0c5d30ed925 Merge "Neutron parses the wrong json revert to shell/csv."
1eb65e0c2d66f8be1b0e63e6d4ff43c0fa3d4bd6 Merge "update README to reflect new puppet-nova parameter"
bfcf24f64b90777766a91fe568c9caab5d137a28 Merge "Add rspec-puppet-facts to the spec_helper"
c4190870b34e6af0f54063b020b4a2abfaeb2eda update README to reflect new puppet-nova parameter
0491d085bb9373bc39ce21527942863b73b67266 Add rspec-puppet-facts to the spec_helper
5d68cd0507684c329cb5c6c1f70b61fb88e36b7e Add api_paste type/provider for Neutron
e8e49e3862f048eec016ddbb50b7c86a8348571b Correctly parse csv even with extra output.
3e3ffdfdd72c6d01417fffd5676175fe094afa3c add ipv6 options to neutron_subnet type
273ef1b228fbcb73edf021fabbf77ff5054e7dd7 Neutron parses the wrong json revert to shell/csv.

Change-Id: If67c8d6465ecf251074c94fa846211e98d5dcd7f

Update nova to fe4fbe65745a8c5a9ac0d093eb10120a8910707b

fe4fbe65745a8c5a9ac0d093eb10120a8910707b Merge "Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance"
b48a76dd8ccc21a0b06956bda9f9e53748af6da1 Merge "Change section name for memcached_servers param"
8540b679cb8ed13430db604d76286b150ca9e3cd Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
37799ed66ae47f5303f82598c0424f4c19b5906b Move 'lock_path' to the oslo_concurrency section
6ca6a3a561ef34621ff0e11922e962dbbb7519af Merge "Remove installation of pm-utils"
265fa4925e10239316c5642a1c64b3901673908b Merge "Use openstack spec helper for spec defaults"
59fd69fd0f19db6ccb74df7287a7ec824478d2dc Change section name for memcached_servers param
238d880e9b36b8656b44a331ab7b7f4888360162 Use openstack spec helper for spec defaults
2e801bf43e97d974f195e78b84d3b9b68ae12bc1 Remove installation of pm-utils

Change-Id: Icde5010c16ab0f298f12a5a8bcc68505645fe905

Update sahara to 6a8300fdf3b3db18aa3c725f3ddcd41231a9b7de

6a8300fdf3b3db18aa3c725f3ddcd41231a9b7de Merge "Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance"
0edc51094da20dbc6303981766cb817b3726e3ab Merge "Add api_paste type/provider for Sahara"
9f4198faceac28634ed7984e89ea0e027bd34c75 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
290383fefe59bd5b1cbfb54d6d5ac93f82fe2a71 Add rspec-puppet-facts to the spec_helper
83cf80c5ce0b2deb0651176ebf3acacdff265489 Add api_paste type/provider for Sahara

Change-Id: I793f68d1ab6f1631c3917ab72314351dca6f2769

Update swift to 4b892bf9dbdf73f5deff651be2920c665dc81f2c

4b892bf9dbdf73f5deff651be2920c665dc81f2c Merge "Grammatical mistake,Changed character from "an" to "a" in below files:"
665557f485c06c6d9c4f31cd247c08387202e3ac Make keystone user/role options configurable
908dca10f288451911d5823ee40a8acc3ed392e1 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
aed5a83f2dc728989474aae16e6a2ef43b7aff77 Grammatical mistake,Changed character from "an" to "a" in below files:
3e9922baab929b77bbed28bf67d40581d444d3d4 Add rspec-puppet-facts to the spec_helper

Change-Id: Iae88849af471d00772864516b29db0bb4ed40d58

Update tempest to 907d69c2afd42e6627ace990d143e1f0684e6593

907d69c2afd42e6627ace990d143e1f0684e6593 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
e1a14026a96dc36005a240e14432e46419899569 Add rspec-puppet-facts to the spec_helper

Change-Id: Ifd89d23243ab73cef85b00961a8428d6af05b377

Update tripleo to b4ec7f7f47a356fc622c73b0822fa18e67a4519a

b4ec7f7f47a356fc622c73b0822fa18e67a4519a Enable X-Forwarded-Proto header for cinder

Change-Id: If09588a25f5f22e1e7a7e87e0104b656074be952

Update trove to 2e03d5bce64780796d1d44d2c7a2cee98ba93b27

2e03d5bce64780796d1d44d2c7a2cee98ba93b27 Merge "Deprecate auth_* old parameters"
4ccae65825539710b7be615953f64acce3cf04d4 Deprecate auth_* old parameters
5db75452a592ddbb4e7bf4e135ec74904315a0e3 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
4f9b1c46ed3ee869c13fb729be2deeb298b4ad5d Add rspec-puppet-facts to the spec_helper

Change-Id: I85c5d390c4274beb0457e200fb29a6d1c3bdd6c5

Update openstacklib to 4599ad667517ae5486d889f7b7e45bd016212aad

4599ad667517ae5486d889f7b7e45bd016212aad Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance

Change-Id: Ifd99f4b9f60f5be18edfd570f32881ea9f2d46b3

Update openstack_extras to 38ec504eb1d720ccb1a6f157e56e784df38dd602

38ec504eb1d720ccb1a6f157e56e784df38dd602 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
3626baf4a31527053b608761d1b1b0ffadba8686 bump to mitaka
950a90ab7a5978d097ae0cda1ad7fc42f53f1b9b Use openstack spec helper for spec defaults

Change-Id: Ib867b6fbf87f242b08c32699d0c1bf8fe28466d5

Update vswitch to 373c13ec382b14ccc0cdd76eb851532fdba257e4

373c13ec382b14ccc0cdd76eb851532fdba257e4 Use puppet-openstack_spec_helper for Rakefile & spec_helper_acceptance
50be7f51f72feef79cfad287b3280a43048e77e5 Add rspec-puppet-facts to the spec_helper
e60454cdb8aab7b570fb9bdb36f8fdf3606274a9 Try to use zuul-cloner to prepare fixtures

Change-Id: I1b622f25b52cec42cd5de3e0d3e98ad939d4a9e2

Puppetfile

@@ -1,5 +1,5 @@
 mod 'aodh',
-  :commit => 'af979699b89161fa7b7a232fd6820d425dc10975',
+  :commit => '1d2f1352137cdbb23b94e1c06b47088f20a9f560',
   :git => 'https://github.com/openstack/puppet-aodh.git'
 
 mod 'apache',
@@ -15,7 +15,7 @@ mod 'cassandra',
   :git => 'https://github.com/locp/cassandra.git'
 
 mod 'ceilometer',
-  :commit => '6941231059b868e32db72e640d04dcd3b8183f96',
+  :commit => '48d299bea89baa7446315b871cd2f506355e08d4',
   :git => 'https://github.com/openstack/puppet-ceilometer.git'
 
 mod 'ceph',
@@ -27,7 +27,7 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '296dbfd5141125a0a34ed2e6997a9fd08f5b0780',
+  :commit => '01ce5f020f3cf82e24fed6f8b504823dc34d8af0',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -71,27 +71,27 @@ mod 'git',
   :git => 'https://github.com/puppetlabs/puppetlabs-git.git'
 
 mod 'glance',
-  :commit => '1f8cacb7367e756966c377953abdcd557da97d7d',
+  :commit => '67bd15682e318167e8b2e0f720b97b62806e7026',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
   :commit => '23b1055314bb435b4725134a9055c8676ccdfcff',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => 'b764d19d488825752e8f335dd3c132ed71170de1',
+  :commit => '60830a46c9876ed14ae5df666853cf611831c1f1',
   :git => 'https://github.com/openstack/puppet-gnocchi.git'
 
 mod 'haproxy',
   :commit => '8b7f2765f18222821d6ec2967e088522e4d64197',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => 'ae2e7760b313d32d77ca47bd731e4af4676278a5',
+  :commit => '32a2b26507931dcfbbc9388ce1d876e06ae69ca6',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '20390eaae31af006479f14dccb794b6111b1d28c',
+  :commit => '748c31eff2637cf16717d02a6ef25fb20a8d6d80',
   :git => 'https://github.com/openstack/puppet-horizon.git'
 
 mod 'inifile',
@@ -103,7 +103,7 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => 'e5022881763d1bbb8ee7997e22771b3293bd06a3',
+  :commit => 'df772a1c606afcaf8e0d515ee413e36e38d0f28d',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'java',
@@ -119,15 +119,15 @@ mod 'keepalived',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => 'cfa106045fe5e763ef315047907fbfb1ffdabb54',
+  :commit => 'b2ac15d113ef759f0c2d40e4836049938aa11a77',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'kibana3',
   :commit => '6ca9631fbe82766134f98e2e8780bb91e7cd3f0e',
   :git => 'https://github.com/thejandroman/puppet-kibana3.git'
 
 mod 'manila',
-  :commit => '2b3aa4ebe15476e07e004be4b87b441b7c8a6178',
+  :commit => '2813212f5177da261449c79c0ae000c3b3f28e2d',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
@@ -163,11 +163,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'ec80ab909fbc2ac36f8425b11f4365c2a32b6ecd',
+  :commit => '7cf01787ccaa4738d98e5346d09d6e500fbb359a',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '32fb6134c0e8c663959e474d3e41f318689b1597',
+  :commit => 'fe4fbe65745a8c5a9ac0d093eb10120a8910707b',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
@@ -183,11 +183,11 @@ mod 'opendaylight',
   :git => 'https://github.com/dfarrell07/puppet-opendaylight.git'
 
 mod 'openstack_extras',
-  :commit => '32afcf4af819aba1b9f8d94822dfb84152a0410b',
+  :commit => '38ec504eb1d720ccb1a6f157e56e784df38dd602',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => '3dcf1cb6c5cf37cb2034f6ad3e038352871a2434',
+  :commit => '4599ad667517ae5486d889f7b7e45bd016212aad',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
@@ -219,7 +219,7 @@ mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '72f48c0da1be9336dc136c152a8c5720e7567758',
+  :commit => '6a8300fdf3b3db18aa3c725f3ddcd41231a9b7de',
   :git => 'https://github.com/openstack/puppet-sahara.git'
 
 mod 'sensu',
@@ -243,15 +243,15 @@ mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '56c3aad3ea756d53cc5d65a0c3f446e63c520389',
+  :commit => '4b892bf9dbdf73f5deff651be2920c665dc81f2c',
   :git => 'https://github.com/openstack/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => 'cb8000bdfa45d0676ef22e48a28eccd27e3d3e66',
+  :commit => '907d69c2afd42e6627ace990d143e1f0684e6593',
   :git => 'https://github.com/openstack/puppet-tempest.git'
 
 mod 'timezone',
@@ -263,11 +263,11 @@ mod 'tomcat',
   :git => 'https://github.com/puppetlabs/puppetlabs-tomcat.git'
 
 mod 'tripleo',
-  :commit => '69d44747ecd9f8fb0c171a7b533f8c3a81d89c5d',
+  :commit => 'b4ec7f7f47a356fc622c73b0822fa18e67a4519a',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '5002dfad3c545753f4faf1ff30ed366db58526d0',
+  :commit => '2e03d5bce64780796d1d44d2c7a2cee98ba93b27',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',
@@ -287,7 +287,7 @@ mod 'vlan',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => 'f39a4ca961ac1353b48c60d2c27aebba8ae1b2da',
+  :commit => '373c13ec382b14ccc0cdd76eb851532fdba257e4',
   :git => 'https://github.com/openstack/puppet-vswitch.git'
 
 mod 'xinetd',

aodh/Rakefile

@@ -1,85 +1 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'json'
-
-modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1]
-
-PuppetSyntax.exclude_paths ||= []
-PuppetSyntax.exclude_paths << "spec/fixtures/**/*"
-PuppetSyntax.exclude_paths << "pkg/**/*"
-PuppetSyntax.exclude_paths << "vendor/**/*"
-
-Rake::Task[:lint].clear
-PuppetLint::RakeTask.new :lint do |config|
-  config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
-  config.fail_on_warnings = true
-  config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
-  config.disable_checks = ["80chars", "class_inherits_from_params_class", "only_variable_string"]
-end
-
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
-Rake::Task[:spec_prep].clear
-desc 'Create the fixtures directory'
-task :spec_prep do
-  # Allow to test the module with custom dependencies
-  # like you could do with .fixtures file
-  if ENV['PUPPETFILE']
-    puppetfile = ENV['PUPPETFILE']
-    if ENV['GEM_HOME']
-      gem_home    = ENV['GEM_HOME']
-      gem_bin_dir = "#{gem_home}" + '/bin/'
-    else
-      gem_bin_dir = ''
-    end
-    r10k = ['env']
-    r10k += ["PUPPETFILE=#{puppetfile}"]
-    r10k += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"]
-    r10k += ["#{gem_bin_dir}r10k"]
-    r10k += ['puppetfile', 'install', '-v']
-    sh(*r10k)
-  else
-  # otherwise, use official OpenStack Puppetfile
-    zuul_ref = ENV['ZUUL_REF']
-    zuul_branch = ENV['ZUUL_BRANCH']
-    zuul_url = ENV['ZUUL_URL']
-    repo = 'openstack/puppet-openstack-integration'
-    rm_rf(repo)
-    if File.exists?('/usr/zuul-env/bin/zuul-cloner')
-      zuul_clone_cmd = ['/usr/zuul-env/bin/zuul-cloner']
-      zuul_clone_cmd += ['--cache-dir', '/opt/git']
-      zuul_clone_cmd += ['--zuul-ref', "#{zuul_ref}"]
-      zuul_clone_cmd += ['--zuul-branch', "#{zuul_branch}"]
-      zuul_clone_cmd += ['--zuul-url', "#{zuul_url}"]
-      zuul_clone_cmd += ['git://git.openstack.org', "#{repo}"]
-      sh(*zuul_clone_cmd)
-    else
-      sh("git clone https://git.openstack.org/#{repo} #{repo}")
-    end
-    script = ['env']
-    script += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"]
-    script += ["ZUUL_REF=#{zuul_ref}"]
-    script += ["ZUUL_BRANCH=#{zuul_branch}"]
-    script += ["ZUUL_URL=#{zuul_url}"]
-    script += ['bash', "#{repo}/install_modules_unit.sh"]
-    sh(*script)
-  end
-  rm_rf("spec/fixtures/modules/#{modname}")
-  ln_s(Dir.pwd, "spec/fixtures/modules/#{modname}")
-  mkdir_p('spec/fixtures/manifests')
-  touch('spec/fixtures/manifests/site.pp')
-end
-
-Rake::Task[:spec_clean].clear
-desc 'Clean up the fixtures directory'
-task :spec_clean do
-  rm_rf('spec/fixtures/modules')
-  rm_rf('openstack')
-  if File.zero?('spec/fixtures/manifests/site.pp')
-    rm_f('spec/fixtures/manifests/site.pp')
-  end
-end
+require 'puppet-openstack_spec_helper/rake_tasks'

aodh/spec/spec_helper_acceptance.rb

@@ -1,56 +1 @@
-require 'beaker-rspec'
-require 'beaker/puppet_install_helper'
-
-run_puppet_install_helper
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  modname = JSON.parse(open('metadata.json').read)['name'].split('-')[1]
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    hosts.each do |host|
-
-      # install git
-      install_package host, 'git'
-
-      zuul_ref = ENV['ZUUL_REF']
-      zuul_branch = ENV['ZUUL_BRANCH']
-      zuul_url = ENV['ZUUL_URL']
-
-      repo = 'openstack/puppet-openstack-integration'
-
-      # Start out with clean moduledir, don't trust r10k to purge it
-      on host, "rm -rf /etc/puppet/modules/*"
-      # Install dependent modules via git or zuul
-      r = on host, "test -e /usr/zuul-env/bin/zuul-cloner", { :acceptable_exit_codes => [0,1] }
-      if r.exit_code == 0
-        zuul_clone_cmd = '/usr/zuul-env/bin/zuul-cloner '
-        zuul_clone_cmd += '--cache-dir /opt/git '
-        zuul_clone_cmd += "--zuul-ref #{zuul_ref} "
-        zuul_clone_cmd += "--zuul-branch #{zuul_branch} "
-        zuul_clone_cmd += "--zuul-url #{zuul_url} "
-        zuul_clone_cmd += "git://git.openstack.org #{repo}"
-        on host, zuul_clone_cmd
-      else
-        on host, "git clone https://git.openstack.org/#{repo} #{repo}"
-      end
-
-      on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh"
-
-      # Install the module being tested
-      on host, "rm -fr /etc/puppet/modules/#{modname}"
-      puppet_module_install(:source => proj_root, :module_name => modname)
-
-      on host, "rm -fr #{repo}"
-
-      # List modules installed to help with debugging
-      on host, puppet('module','list'), { :acceptable_exit_codes => 0 }
-    end
-  end
-end
+require 'puppet-openstack_spec_helper/beaker_spec_helper'

ceilometer/Gemfile

@@ -3,6 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 group :development, :test do
   gem 'puppetlabs_spec_helper',               :require => 'false'
   gem 'rspec-puppet', '~> 2.2.0',             :require => 'false'
+  gem 'rspec-puppet-facts',                   :require => 'false'
   gem 'metadata-json-lint',                   :require => 'false'
   gem 'puppet-lint-param-docs',               :require => 'false'
   gem 'puppet-lint-absolute_classname-check', :require => 'false'
@@ -14,6 +15,9 @@ group :development, :test do
   gem 'puppet-lint-numericvariable',          :require => 'false'
   gem 'json',                                 :require => 'false'
   gem 'webmock',                              :require => 'false'
+  gem 'puppet-openstack_spec_helper',
+      :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+      :require => false
 end
 
 group :system_tests do