diff --git a/lib/puppet-openstack_spec_helper/rake_tasks.rb b/lib/puppet-openstack_spec_helper/rake_tasks.rb index 7b889a9..90c6459 100644 --- a/lib/puppet-openstack_spec_helper/rake_tasks.rb +++ b/lib/puppet-openstack_spec_helper/rake_tasks.rb @@ -61,6 +61,11 @@ task :spec_prep do else sh("git clone https://git.openstack.org/#{repo} #{repo}") end + # Allow to a repository to have extra modules that are not + # in puppet-openstack-integration + if File.exists?("#{Dir.pwd}/Puppetfile_extras") + sh("cat #{Dir.pwd}/Puppetfile_extras >> #{repo}/Puppetfile") + end script = ['env'] script += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"] script += ["ZUUL_REF=#{zuul_ref}"] diff --git a/releasenotes/notes/puppetfile_extras-f49799b6edbe69a2.yaml b/releasenotes/notes/puppetfile_extras-f49799b6edbe69a2.yaml new file mode 100644 index 0000000..edcf1d0 --- /dev/null +++ b/releasenotes/notes/puppetfile_extras-f49799b6edbe69a2.yaml @@ -0,0 +1,6 @@ +--- +features: + - If Puppetfile_extras file does exist in a Puppet module, the spec_helper will copy + its content to the end of Puppet OpenStack Puppetfile. It will allow external modules + (for example puppet-tripleo) to re-use Puppet OpenStack tooling, but adding more modules + in the tests.