[docker_daemon] agent6 goes back to docker.yaml for config

Author: truthbk

manifests/integrations/docker_daemon.pp

@@ -34,7 +34,7 @@
   }
 
   if $::datadog_agent::agent6_enable {
-    $legacy_conf = "${datadog_agent::conf6_dir}/docker.yaml"
+    $legacy_conf = "${datadog_agent::conf6_dir}/docker_daemon.yaml"
   } else {
     $legacy_conf = "${datadog_agent::conf_dir}/docker.yaml"
   }
@@ -44,7 +44,7 @@
   }
 
   if $::datadog_agent::agent6_enable {
-    $dst = "${datadog_agent::conf6_dir}/docker_daemon.yaml"
+    $dst = "${datadog_agent::conf6_dir}/docker.yaml"
   } else {
     $dst = "${datadog_agent::conf_dir}/docker_daemon.yaml"
   }

spec/classes/datadog_agent_integrations_docker_daemon_spec.rb

@@ -17,7 +17,11 @@
       let(:dd_group) { 'root' }
       let(:dd_package) { 'datadog-agent' }
       let(:dd_service) { 'datadog-agent' }
-      let(:conf_file) { "#{conf_dir}/docker_daemon.yaml" }
+      if !enabled
+        let(:conf_file) { "#{conf_dir}/docker_daemon.yaml" }
+      else
+        let(:conf_file) { "#{conf_dir}/docker.yaml" }
+      end
 
       it { should compile.with_all_deps }
       it { should contain_file(conf_file).with(