From 5c378174e37bdb1fae0cbfe8b202efba2383fd84 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Tue, 24 Sep 2013 17:12:27 -0400 Subject: [PATCH] Ensure that ::setup runs before ::fragment in all cases. --- Gemfile | 1 - manifests/setup.pp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 783e522..d5738af 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,6 @@ group :development, :test do gem 'serverspec', :require => false gem 'rspec-system-serverspec', :require => false gem 'pry', :require => false - gem 'vagrant-wrapper', :require => false end if puppetversion = ENV['PUPPET_GEM_VERSION'] diff --git a/manifests/setup.pp b/manifests/setup.pp index 2d29bf8..15be696 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -52,4 +52,8 @@ class concat::setup { '/usr/local/bin/concatfragments.sh': ensure => absent; } + + # Ensure we run setup first. + Class['concat::setup'] -> Concat::Fragment<| |> + }