Merge pull request #511 from cultuurnet/feature/newrelic-infra-warnings

Override deprecated /var/run PIDFile location for newrelic infra

Author: willaerk

manifests/newrelic/infrastructure.pp

@@ -8,22 +8,21 @@
 
   if $license_key {
     class { 'profiles::newrelic::infrastructure::install':
-      version => $version
+      version => $version,
+      notify  => Class['profiles::newrelic::infrastructure::service']
     }
 
     class { 'profiles::newrelic::infrastructure::configuration':
       license_key => $license_key,
       log_level   => $log_level,
-      attributes  => $attributes
+      attributes  => $attributes,
+      require     => Class['profiles::newrelic::infrastructure::install'],
+      notify      => Class['profiles::newrelic::infrastructure::service']
     }
 
     class { 'profiles::newrelic::infrastructure::service':
       status => $service_status
     }
-
-    Class['profiles::newrelic::infrastructure::install'] -> Class['profiles::newrelic::infrastructure::configuration']
-    Class['profiles::newrelic::infrastructure::configuration'] ~> Class['profiles::newrelic::infrastructure::service']
-
   }
 }
 

manifests/newrelic/infrastructure/configuration.pp

@@ -18,6 +18,13 @@
     content => template('profiles/newrelic/infrastructure/newrelic-infra.yml.erb')
   }
 
+  systemd::dropin_file { 'newrelic-infra_override.conf':
+    ensure   => 'present',
+    unit     => 'newrelic-infra.service',
+    filename => 'override.conf',
+    content  => "[Service]\nPIDFile=/run/newrelic-infra/newrelic-infra.pid"
+  }
+
   file { '/etc/newrelic-infra/integrations.d':
     ensure  => 'directory',
     recurse => true,

spec/classes/newrelic/infrastructure/configuration_spec.rb

@@ -44,6 +44,13 @@
               'mode'   => '0640'
             ) }
 
+            it { is_expected.to contain_systemd__dropin_file('newrelic-infra_override.conf').with(
+              'unit'           => 'newrelic-infra.service',
+              'ensure'         => 'present',
+              'filename'       => 'override.conf',
+              'content'        => "[Service]\nPIDFile=/run/newrelic-infra/newrelic-infra.pid"
+            ) }
+
             it { is_expected.to contain_file('/etc/newrelic-infra.yml').with_content(/^license_key: my_license_key$/) }
             it { is_expected.to contain_file('/etc/newrelic-infra.yml').with_content(/^display_name: mynode.example.com$/) }
             it { is_expected.to contain_file('/etc/newrelic-infra.yml').with_content(/^dns_hostname_resolution: false$/) }

spec/classes/newrelic/infrastructure_spec.rb

@@ -36,6 +36,7 @@
           ) }
 
           it { is_expected.to contain_class('profiles::newrelic::infrastructure::install').that_comes_before('Class[profiles::newrelic::infrastructure::configuration]') }
+          it { is_expected.to contain_class('profiles::newrelic::infrastructure::install').that_notifies('Class[profiles::newrelic::infrastructure::service]') }
           it { is_expected.to contain_class('profiles::newrelic::infrastructure::configuration').that_notifies('Class[profiles::newrelic::infrastructure::service]') }
         end