Merge pull request #819 from geerlingguy/solr-update

Issue #789: Remove .galaxy_install_info files and update Solr role to 3.1.2.
geerlingguy · Jul 24, 2016 · cbd2263 · cbd2263
2 parents 60a291f + 0962496
commit cbd2263
Show file tree

Hide file tree

Showing 39 changed files with 15 additions and 37 deletions.
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
@@ -64,6 +64,6 @@
 - src: geerlingguy.security
   version: 1.2.0
 - src: geerlingguy.solr
-  version: 3.1.0
+  version: 3.1.2
 - src: geerlingguy.varnish
   version: 1.6.1
diff --git a/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info b/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -53,8 +53,10 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)

diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "6.0.1"
+solr_version: "6.1.0"
 solr_mirror: "https://archive.apache.org/dist"
 
 solr_service_name: solr

diff --git a/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -13,3 +13,9 @@
     -s {{ solr_service_name }}
     -p {{ solr_port }}
     creates={{ solr_install_dir }}/solr/bin/solr
+  register: solr_install_script_result
+
+# Workaround for bug https://github.com/ansible/ansible-modules-core/issues/915.
+- name: Ensure solr is stopped (RHEL 7 workaround).
+  command: service {{ solr_service_name }} stop
+  when: (ansible_os_family == 'RedHat') and (ansible_distribution_version.split(".")[0] == '7') and (solr_install_script_result.changed)
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
@@ -12,6 +12,9 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
 rm -f /lib/systemd/system/basic.target.wants/*; \
 rm -f /lib/systemd/system/anaconda.target.wants/*;
 
+# Install initscripts
+RUN yum -y install initscripts
+
 # Install Ansible
 RUN yum -y install epel-release
 RUN yum -y install git ansible sudo

diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -2,7 +2,7 @@
 - hosts: all
 
   vars:
-    solr_version: "5.5.1"
+    solr_version: "5.5.2"
     java_packages:
       - openjdk-7-jdk
 

diff --git a/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info