Explicitly set xpack.security.enabled: True

Only run test for checking if X-Pack is a plugin for 6.3 because it is
now installed into core

test/integration/helpers/serverspec/xpack_spec.rb

@@ -80,21 +80,13 @@ shared_examples 'xpack::init' do |vars|
     it { should_not exist }
   end
 
-  #Xpack specific tests
+  # X-Pack is no longer installed as a plugin in elasticsearch
+  if vars['es_major_version'] == '5.x'
     describe file('/usr/share/elasticsearch/plugins') do
       it { should be_directory }
       it { should be_owned_by 'elasticsearch' }
     end
 
-  #Test if x-pack is activated
-  describe 'x-pack activation' do
-    it 'should be activated and valid' do
-      command = command('curl -s localhost:9200/_license?pretty=true -u es_admin:changeMeAgain')
-      expect(command.stdout).to match('"status" : "active"')
-      expect(command.exit_status).to eq(0)
-    end
-  end
-
     describe file('/usr/share/elasticsearch/plugins/x-pack') do
       it { should be_directory }
       it { should be_owned_by 'elasticsearch' }
@@ -104,12 +96,38 @@ shared_examples 'xpack::init' do |vars|
       its(:exit_status) { should eq 0 }
     end
 
-  describe file('/etc/elasticsearch/security_node/x-pack') do
+    describe file('/usr/share/elasticsearch/plugins/x-pack') do
       it { should be_directory }
       it { should be_owned_by 'elasticsearch' }
     end
 
-  describe file('/usr/share/elasticsearch/plugins/x-pack') do
+    describe 'xpack plugin' do
+      it 'should be installed with the correct version' do
+        plugins = curl_json('http://localhost:9200/_nodes/plugins')
+        node, data = plugins['nodes'].first
+        version = 'plugin not found'
+        name = 'x-pack'
+
+        data['plugins'].each do |plugin|
+          if plugin['name'] == name
+            version = plugin['version']
+          end
+        end
+        expect(version).to eql(vars['es_version'])
+      end
+    end
+  end
+
+  #Test if x-pack is activated
+  describe 'x-pack activation' do
+    it 'should be activated and valid' do
+      command = command('curl -s localhost:9200/_license?pretty=true -u es_admin:changeMeAgain')
+      expect(command.stdout).to match('"status" : "active"')
+      expect(command.exit_status).to eq(0)
+    end
+  end
+
+  describe file('/etc/elasticsearch/security_node/x-pack') do
     it { should be_directory }
     it { should be_owned_by 'elasticsearch' }
   end

test/integration/issue-test.yml

@@ -8,16 +8,14 @@
   tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - {
-        role: elasticsearch,
+    - role: elasticsearch
+      es_instance_name: "security_node"
       es_config:
-        {
-          "xpack.security.authc.realms.file1.type": "file",
-          "xpack.security.authc.realms.file1.order": 1,
-          "xpack.security.authc.realms.native1.type": "native",
-          "xpack.security.authc.realms.native1.order": 0
-        },
-    es_instance_name: "security_node" }
+        xpack.security.enabled: True
+        xpack.security.authc.realms.file1.type: "file"
+        xpack.security.authc.realms.file1.order: 1
+        xpack.security.authc.realms.native1.type: "native"
+        xpack.security.authc.realms.native1.order: 0
   vars:
     es_heap_size: "1g"
     es_enable_xpack: true

test/integration/xpack.yml

@@ -106,9 +106,18 @@
   tasks:
     - include: elasticsearch/test/integration/debug.yml
   roles:
-    - { role: elasticsearch, es_api_port: 9200, es_config: { "http.port": 9200, "transport.tcp.port":9300, discovery.zen.ping.unicast.hosts: "localhost:9300",
-    "xpack.security.authc.realms.file1.type": "file","xpack.security.authc.realms.file1.order": 0, "xpack.security.authc.realms.native1.type": "native","xpack.security.authc.realms.native1.order": 1 },
-    es_instance_name: "security_node" }
+    - role: elasticsearch
+      es_api_port: 9200
+      es_instance_name: "security_node"
+      es_config: 
+        http.port: 9200
+        transport.tcp.port: 9300
+        discovery.zen.ping.unicast.hosts: "localhost:9300"
+        xpack.security.enabled: True
+        xpack.security.authc.realms.file1.type: "file"
+        xpack.security.authc.realms.file1.order: 0
+        xpack.security.authc.realms.native1.type: "native"
+        xpack.security.authc.realms.native1.order: 1
   vars:
     es_heap_size: "1g"
     es_templates: true