Rework how classes are ordered

bastelfreak · Sep 20, 2017 · c7bc507 · c7bc507
1 parent d09835a
commit c7bc507
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -92,9 +92,11 @@
     fail('cfg parameter must be a hash')
   }
 
-  anchor { 'grafana::begin': }
-  -> class { '::grafana::install': }
-  -> class { '::grafana::config': }
-  ~> class { '::grafana::service': }
-  -> anchor { 'grafana::end': }
+  contain grafana::install
+  contain grafana::config
+  contain grafana::service
+
+  Class['grafana::install']
+  -> Class['grafana::config']
+  ~> Class['grafana::service']
 }
diff --git a/spec/classes/grafana_spec.rb b/spec/classes/grafana_spec.rb
@@ -28,12 +28,10 @@
       context 'with default values' do
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('grafana') }
-        it { is_expected.to contain_anchor('grafana::begin') }
         it { is_expected.to contain_class('grafana::params') }
-        it { is_expected.to contain_class('grafana::install') }
-        it { is_expected.to contain_class('grafana::config') }
+        it { is_expected.to contain_class('grafana::install').that_comes_before('Class[grafana::config]') }
+        it { is_expected.to contain_class('grafana::config').that_notifies('Class[grafana::service]') }
         it { is_expected.to contain_class('grafana::service') }
-        it { is_expected.to contain_anchor('grafana::end') }
       end
 
       context 'with parameter install_method is set to package' do