Fix role and user manifests

Author: Gavin Williams

manifests/role.pp

@@ -1,4 +1,4 @@
-# Manage shield/x-pack roles.
+# Manage x-pack roles.
 #
 # @param ensure
 #   Whether the role should be present or not.
@@ -9,7 +9,7 @@
 #
 # @param privileges
 #   A hash of permissions defined for the role. Valid privilege settings can
-#   be found in the Shield/x-pack documentation.
+#   be found in the x-pack documentation.
 #
 # @example create and manage the role 'power_user' mapped to an LDAP group.
 #   elasticsearch::role { 'power_user':
@@ -25,16 +25,14 @@
 #   }
 #
 # @author Tyler Langlois <tyler.langlois@elastic.co>
+# @author Gavin Williams <gavin.williams@elastic.co>
 #
 define elasticsearch::role (
   Enum['absent', 'present'] $ensure     = 'present',
   Array                     $mappings   = [],
   Hash                      $privileges = {},
 ) {
   validate_slength($name, 30, 1)
-  if $elasticsearch::security_plugin == undef {
-    fail("\"${elasticsearch::security_plugin}\" required")
-  }
 
   if empty($privileges) or $ensure == 'absent' {
     $_role_ensure = 'absent'

manifests/user.pp

@@ -1,4 +1,4 @@
-# Manages shield/x-pack users.
+# Manages x-pack users.
 #
 # @example creates and manage a user with membership in the 'logstash' and 'kibana4' roles.
 #   elasticsearch::user { 'bob':
@@ -20,16 +20,13 @@
 #   A list of roles to which the user should belong.
 #
 # @author Tyler Langlois <tyler.langlois@elastic.co>
+# @author Gavin Williams <gavin.williams@elastic.co>
 #
 define elasticsearch::user (
   String                    $password,
   Enum['absent', 'present'] $ensure = 'present',
   Array                     $roles  = [],
 ) {
-  if $elasticsearch::security_plugin == undef {
-    fail("\"${elasticsearch::security_plugin}\" required")
-  }
-
   if $password =~ /^\$2a\$/ {
     elasticsearch_user_file { $name:
       ensure          => $ensure,