Merge pull request #1160 from phaedriel/remove_datacat

Author: smortex

.fixtures.yml

@@ -4,7 +4,6 @@ fixtures:
     archive: https://github.com/voxpupuli/puppet-archive.git
     augeas_core: https://github.com/puppetlabs/puppetlabs-augeas_core.git
     concat: https://github.com/puppetlabs/puppetlabs-concat.git
-    datacat: https://github.com/richardc/puppet-datacat.git
     elastic_stack: https://github.com/voxpupuli/puppet-elastic_stack.git
     java: https://github.com/puppetlabs/puppetlabs-java.git
     java_ks: https://github.com/puppetlabs/puppetlabs-java_ks.git

README.md

@@ -60,7 +60,6 @@ Therefore please ensure that you test this major release in your environment bef
 ### Requirements
 
 * The [stdlib](https://forge.puppetlabs.com/puppetlabs/stdlib) Puppet library.
-* [richardc/datacat](https://forge.puppetlabs.com/richardc/datacat)
 * [Augeas](http://augeas.net/)
 * [puppetlabs-java_ks](https://forge.puppetlabs.com/puppetlabs/java_ks) for certificate management (optional).
 

manifests/config.pp

@@ -157,25 +157,21 @@
     # }
 
     # Generate Elasticsearch config
-    $_es_config = merge(
+    $data = merge(
       $elasticsearch::config,
       { 'path.data' => $elasticsearch::datadir },
       { 'path.logs' => $elasticsearch::logdir },
       $_tls_config
     )
 
-    datacat_fragment { 'main_config':
-      target => "${elasticsearch::configdir}/elasticsearch.yml",
-      data   => $_es_config,
-    }
-
-    datacat { "${elasticsearch::configdir}/elasticsearch.yml":
-      template => "${module_name}/etc/elasticsearch/elasticsearch.yml.erb",
-      notify   => $elasticsearch::_notify_service,
-      require  => Class['elasticsearch::package'],
-      owner    => $elasticsearch::elasticsearch_user,
-      group    => $elasticsearch::elasticsearch_group,
-      mode     => '0440',
+    file { "${elasticsearch::configdir}/elasticsearch.yml":
+      ensure  => 'file',
+      content => template("${module_name}/etc/elasticsearch/elasticsearch.yml.erb"),
+      notify  => $elasticsearch::_notify_service,
+      require => Class['elasticsearch::package'],
+      owner   => $elasticsearch::elasticsearch_user,
+      group   => $elasticsearch::elasticsearch_group,
+      mode    => '0440',
     }
 
     if ($elasticsearch::version != false and versioncmp($elasticsearch::version, '7.7.0') >= 0) {

metadata.json

@@ -12,10 +12,6 @@
       "name": "puppet/elastic_stack",
       "version_requirement": ">= 8.0.0 < 9.0.0"
     },
-    {
-      "name": "richardc/datacat",
-      "version_requirement": ">= 0.6.2 < 1.0.0"
-    },
     {
       "name": "puppetlabs/java",
       "version_requirement": ">= 1.0.0 < 9.0.0"

spec/classes/001_hiera_spec.rb

@@ -59,8 +59,6 @@
 
           it { is_expected.to contain_augeas('/etc/sysconfig/elasticsearch') }
           it { is_expected.to contain_file('/etc/elasticsearch/elasticsearch.yml') }
-          it { is_expected.to contain_datacat('/etc/elasticsearch/elasticsearch.yml') }
-          it { is_expected.to contain_datacat_fragment('main_config') }
 
           it {
             expect(subject).to contain_service('elasticsearch').with(

spec/helpers/class_shared_examples.rb

@@ -4,7 +4,5 @@
   it { is_expected.to compile.with_all_deps }
   it { is_expected.to contain_augeas('/etc/sysconfig/elasticsearch') }
   it { is_expected.to contain_file('/etc/elasticsearch/elasticsearch.yml') }
-  it { is_expected.to contain_datacat('/etc/elasticsearch/elasticsearch.yml') }
-  it { is_expected.to contain_datacat_fragment('main_config') }
   it { is_expected.to contain_service('elasticsearch') }
 end