Merge pull request #1085 from elastic/remove_multi-instance

.travis.yml

@@ -50,6 +50,12 @@ jobs:
     - PUPPET_VERSION='~> 5.0'
   - stage: acceptance
     env:
+    - BEAKER_PUPPET_COLLECTION=puppet6
+    - TASK=beaker:amazonlinux-1-x64:acceptance
+  - env:
+    - BEAKER_PUPPET_COLLECTION=puppet6
+    - TASK=beaker:amazonlinux-2-x64:acceptance
+  - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-6-x64:acceptance
   - env:
@@ -58,9 +64,6 @@ jobs:
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-8-x64:acceptance
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:amazonlinux-1-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:oracle-6-x64:acceptance

data/common.yaml

@@ -17,6 +17,8 @@ elasticsearch::daily_rolling_date_pattern: |
 elasticsearch::datadir_instance_directories: true
 elasticsearch::default_logging_level: 'INFO'
 elasticsearch::defaults_location: ~
+elasticsearch::deprecation_logging: false
+elasticsearch::deprecation_logging_level: 'DEBUG'
 elasticsearch::download_tool: ~
 elasticsearch::download_tool_insecure: ~
 elasticsearch::download_tool_verify_certificates: true
@@ -31,6 +33,7 @@ elasticsearch::license: ~
 elasticsearch::logdir: /var/log/elasticsearch
 elasticsearch::logging_config: {}
 elasticsearch::logging_file: ~
+elasticsearch::logging_level: 'INFO'
 elasticsearch::logging_template: ~
 elasticsearch::manage_repo: true
 elasticsearch::oss: false
@@ -55,9 +58,10 @@ elasticsearch::scripts: {}
 elasticsearch::secrets: ~
 elasticsearch::security_logging_content: ~
 elasticsearch::security_logging_source: ~
-elasticsearch::security_plugin: ~
+elasticsearch::service_name: elasticsearch
 elasticsearch::service_provider: systemd
 elasticsearch::snapshot_repositories: {}
+elasticsearch::ssl: false
 elasticsearch::status: enabled
 elasticsearch::system_key: ~
 elasticsearch::systemd_service_path: /lib/systemd/system

lib/puppet/provider/elastic_parsedfile.rb

@@ -3,24 +3,10 @@
 # Parent class for Elasticsearch-based providers that need to access
 # specific configuration directories.
 class Puppet::Provider::ElasticParsedFile < Puppet::Provider::ParsedFile
-  # Find/set a shield configuration file.
-  #
-  # @return String
-  def self.shield_config(val)
-    @default_target ||= "/etc/elasticsearch/shield/#{val}"
-  end
-
   # Find/set an x-pack configuration file.
   #
   # @return String
   def self.xpack_config(val)
-    @default_target ||= "/etc/elasticsearch/x-pack/#{val}"
-  end
-
-  # Find/set an oss x-pack configuration file.
-  #
-  # @return String
-  def self.oss_xpack_config(val)
     @default_target ||= "/etc/elasticsearch/#{val}"
   end
 end

lib/puppet/provider/elastic_user_roles.rb

@@ -1,6 +1,6 @@
 require 'puppet/provider/elastic_yaml'
 
-# Provider to help manage file-based Shield/X-Pack user/role configuration
+# Provider to help manage file-based X-Pack user/role configuration
 # files.
 class Puppet::Provider::ElasticUserRoles < Puppet::Provider::ElasticYaml
   # Override the ancestor `parse` method to process a users/roles file

lib/puppet/provider/elasticsearch_license/x-pack.rb → lib/puppet/provider/elasticsearch_license/xpack.rb

@@ -1,5 +1,3 @@
-# rubocop:disable Style/FileName
-# rubocop:enable Style/FileName
 require 'puppet/provider/elastic_rest'
 
 Puppet::Type.type(:elasticsearch_license).provide(

lib/puppet/provider/elasticsearch_role/xpack.rb → lib/puppet/provider/elasticsearch_role/ruby.rb

@@ -1,12 +1,11 @@
 require 'puppet/provider/elastic_yaml'
 
 Puppet::Type.type(:elasticsearch_role).provide(
-  :xpack,
+  :ruby,
   :parent => Puppet::Provider::ElasticYaml,
   :metadata => :privileges
 ) do
   desc 'Provider for X-Pack role resources.'
 
   xpack_config 'roles.yml'
-  confine :exists => default_target
 end

lib/puppet/provider/elasticsearch_role_mapping/xpack.rb → lib/puppet/provider/elasticsearch_role_mapping/ruby.rb

@@ -1,12 +1,11 @@
 require 'puppet/provider/elastic_yaml'
 
 Puppet::Type.type(:elasticsearch_role_mapping).provide(
-  :xpack,
+  :ruby,
   :parent => Puppet::Provider::ElasticYaml,
   :metadata => :mappings
 ) do
   desc 'Provider for X-Pack role mappings.'
 
   xpack_config 'role_mapping.yml'
-  confine :exists => default_target
 end

lib/puppet/provider/elasticsearch_user/elasticsearch_users.rb → lib/puppet/provider/elasticsearch_user/ruby.rb

@@ -1,11 +1,10 @@
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'puppet/provider/elastic_user_command')
 
 Puppet::Type.type(:elasticsearch_user).provide(
-  :elasticsearch_users,
+  :ruby,
   :parent => Puppet::Provider::ElasticUserCommand
 ) do
-  desc 'Provider for OSS X-Pack user resources.'
-  confine :exists => "#{homedir}/bin/elasticsearch-users"
+  desc 'Provider for X-Pack user resources.'
 
   has_feature :manages_plaintext_passwords