Test improvements for xpack + httplib2 support

.kitchen.yml

@@ -136,7 +136,6 @@ suites:
             version: latest
     provisioner:
       playbook: test/integration/multi.yml
-  #Currently we only test shield on 2x
   - name: xpack-2x
     run_list:
     attributes:

tasks/elasticsearch-Debian.yml

@@ -26,3 +26,7 @@
   apt: deb=/tmp/elasticsearch-{{ es_version }}.deb
   when: not es_use_repository
   register: elasticsearch_install_from_package
+
+# ansible uri module requires httplib2
+- name: pip httplib2
+  pip: name=httplib2 extra_args="--user"

tasks/elasticsearch-RedHat.yml

@@ -20,3 +20,7 @@
   yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
   when: not es_use_repository
   register: elasticsearch_install_from_package
+
+# ansible uri module requires httplib2
+- name: pip httplib2
+  pip: name=httplib2 extra_args="--user"

tasks/xpack/elasticsearch-xpack.yml

@@ -23,11 +23,10 @@
     CONF_DIR: "{{ conf_dir }}"
     ES_INCLUDE: "{{ instance_default_file }}"
 
-
-- name: Set Plugin Directory Permissions
-  file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes
-
-- include: elasticsearch-shield.yml
+- include: shield/elasticsearch-shield.yml
   when: '"shield" in es_xpack_features'
 
 #Any other xpacks plugins requiring configuration to be entered here
+
+- name: Set Plugin Directory Permissions
+  file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes

tasks/xpack/shield/elasticsearch-shield.yml

@@ -37,7 +37,6 @@
   notify: load-native-realms
   when: (es_users is defined and es_users.native is defined) or (es_roles is defined and es_roles.native is defined)
 
-
 #Ensure shield conf directory is created
 - name: Ensure shield conf directory exists
   file: path={{ conf_dir }}/shield state=directory owner={{ es_user }} group={{ es_group }}

test/integration/helpers/serverspec/package_spec.rb

@@ -26,8 +26,6 @@ shared_examples 'package::init' do  |es_version,plugins|
     it { should be_owned_by 'elasticsearch' }
   end
 
-
-
   describe file('/etc/elasticsearch/node1/scripts/calculate-score.groovy') do
     it { should be_file }
     it { should be_owned_by 'elasticsearch' }

test/integration/helpers/serverspec/xpack_spec.rb

@@ -0,0 +1,147 @@
+require 'spec_helper'
+
+shared_examples 'xpack::init' do |es_version|
+
+  describe user('elasticsearch') do
+    it { should exist }
+  end
+
+  describe service('shield_node_elasticsearch') do
+    it { should be_running }
+  end
+
+  describe package('elasticsearch') do
+    it { should be_installed }
+  end
+
+  describe file('/etc/elasticsearch/shield_node/elasticsearch.yml') do
+    it { should be_file }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+  describe file('/etc/elasticsearch/shield_node/logging.yml') do
+    it { should be_file }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+  describe file('/etc/elasticsearch/shield_node/elasticsearch.yml') do
+    it { should contain 'node.name: localhost-shield_node' }
+    it { should contain 'cluster.name: elasticsearch' }
+    it { should contain 'path.conf: /etc/elasticsearch/shield_node' }
+    it { should contain 'path.data: /var/lib/elasticsearch/localhost-shield_node' }
+    it { should contain 'path.work: /tmp/elasticsearch/localhost-shield_node' }
+    it { should contain 'path.logs: /var/log/elasticsearch/localhost-shield_node' }
+  end
+
+  describe 'Node listening' do
+    it 'listening in port 9200' do
+      expect(port 9200).to be_listening
+    end
+  end
+
+  describe 'version check' do
+    it 'should be reported as version '+es_version do
+      command = command('curl -s localhost:9200 -u es_admin:changeMe | grep number')
+      expect(command.stdout).to match(es_version)
+      expect(command.exit_status).to eq(0)
+    end
+  end
+
+  describe file('/etc/init.d/elasticsearch') do
+    it { should_not exist }
+  end
+
+  describe file('/etc/default/elasticsearch') do
+    it { should_not exist }
+  end
+
+  describe file('/etc/sysconfig/elasticsearch') do
+    it { should_not exist }
+  end
+
+  describe file('/usr/lib/systemd/system/elasticsearch.service') do
+    it { should_not exist }
+  end
+
+  describe file('/etc/elasticsearch/elasticsearch.yml') do
+    it { should_not exist }
+  end
+
+  describe file('/etc/elasticsearch/logging.yml') do
+    it { should_not exist }
+  end
+
+  #Xpack specific tests
+  describe file('/usr/share/elasticsearch/plugins') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+
+  #Check shield and license plugins are installed
+  describe file('/usr/share/elasticsearch/plugins/license') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep license') do
+    its(:exit_status) { should eq 0 }
+  end
+
+  describe file('/usr/share/elasticsearch/plugins/shield') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+  describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep shield') do
+    its(:exit_status) { should eq 0 }
+  end
+
+  describe file('/etc/elasticsearch/shield_node/shield') do
+    it { should be_directory }
+    it { should be_owned_by 'elasticsearch' }
+  end
+
+
+  #Test users file, users_roles and roles.yml
+  describe file('/etc/elasticsearch/shield_node/shield/users_roles') do
+    it { should be_owned_by 'elasticsearch' }
+    it { should contain 'admin:es_admin' }
+    it { should contain 'power_user:testUser' }
+  end
+
+  describe file('/etc/elasticsearch/shield_node/shield/users') do
+    it { should be_owned_by 'elasticsearch' }
+    it { should contain 'testUser:' }
+    it { should contain 'es_admin:' }
+  end
+
+
+  describe file('/etc/elasticsearch/shield_node/shield/roles.yml') do
+    it { should be_owned_by 'elasticsearch' }
+    #Test contents as expected
+    its(:md5sum) { should eq '7800182547287abd480c8b095bf26e9e' }
+  end
+
+
+  #Test native roles and users are loaded
+  describe command('curl -s localhost:9200/_shield/user -u es_admin:changeMe | md5sum | grep 557a730df7136694131b5b7012a5ffad') do
+    its(:exit_status) { should eq 0 }
+  end
+
+  describe command('curl -s localhost:9200/_shield/user -u es_admin:changeMe | grep "{\"kibana4_server\":{\"username\":\"kibana4_server\",\"roles\":\[\"kibana4_server\"\],\"full_name\":null,\"email\":null,\"metadata\":{}}}"') do
+    its(:exit_status) { should eq 0 }
+  end
+
+  describe command('curl -s localhost:9200/_shield/role -u es_admin:changeMe | grep "{\"logstash\":{\"cluster\":\[\"manage_index_templates\"\],\"indices\":\[{\"names\":\[\"logstash-\*\"\],\"privileges\":\[\"write\",\"delete\",\"create_index\"\]}\],\"run_as\":\[\]}}"') do
+    its(:exit_status) { should eq 0 }
+  end
+
+  describe command('curl -s localhost:9200/_shield/role -u es_admin:changeMe | md5sum | grep 6d14f09ef1eea64adf4d4a9c04229629') do
+    its(:exit_status) { should eq 0 }
+  end
+
+
+  #Test contents of Elasticsearch.yml file
+end
+

test/integration/xpack-2x/serverspec/default_spec.rb

@@ -0,0 +1,5 @@
+require 'xpack_spec'
+
+describe 'Xpack Tests v 2.x' do
+  include_examples 'xpack::init', "2.3.4"
+end

test/integration/xpack-2x/serverspec/xpack_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-describe 'XPack Tests v 2.x' do
-
-  describe user('elasticsearch') do
-    it { should exist }
-  end
-
-end
-

test/integration/xpack.yml

@@ -1,6 +1,6 @@
 ---
 - name: Elasticsearch Xpack tests
-  hosts: localhostpost
+  hosts: localhost
   roles:
     - { role: elasticsearch, es_config: { "http.port": 9200, "transport.tcp.port":9300, discovery.zen.ping.unicast.hosts: "localhost:9300" }, es_instance_name: "shield_node" }
   vars: