diff --git a/CHANGELOG.md b/CHANGELOG.md index 32812e3..b850811 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. ## [Unreleased](https://github.com/idealista/solrcloud-role/tree/develop) +## [1.7.0](https://github.com/idealista/solrcloud-role/tree/1.7.0) (2017-06-29) +[Full Changelog](https://github.com/idealista/solrcloud-role/compare/1.6.0...1.7.0) + +### Changed +- *[#36](https://github.com/idealista/solrcloud-role/issues/36) Support Debian stretch* @jmonterrubio + + ## [1.6.0](https://github.com/idealista/solrcloud-role/tree/1.6.0) (2017-04-24) [Full Changelog](https://github.com/idealista/solrcloud-role/compare/1.5.2...1.6.0) diff --git a/README.md b/README.md index 18c8268..394ee10 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Logo](logo.gif) +![Logo](https://raw.githubusercontent.com/idealista/solrcloud-role/master/logo.gif) # SolrCloud Ansible role @@ -21,7 +21,7 @@ These instructions will get you a copy of the role for your ansible playbook. On ### Prerequisities -Ansible 2.2.0.0 version installed. +Ansible 2.2.1.0 version installed. Inventory destination should be a Debian environment. For testing purposes, [Molecule](https://molecule.readthedocs.io/) with [Vagrant](https://www.vagrantup.com/) as driver (with [landrush](https://github.com/vagrant-landrush/landrush) plugin) and [VirtualBox](https://www.virtualbox.org/) as provider. @@ -59,12 +59,14 @@ Look to the defaults properties file to see the possible configuration propertie ## Testing ``` -molecule test +molecule test --platform=Debian9 ``` +See molecule.yml to check possible testing platforms. + ## Built With -![Ansible](https://img.shields.io/badge/ansible-2.2.0.0-green.svg) +![Ansible](https://img.shields.io/badge/ansible-2.2.1.0-green.svg) ## Versioning diff --git a/meta/main.yml b/meta/main.yml index 78b579d..86c688a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -2,9 +2,10 @@ galaxy_info: company: Idealista S.A. description: SolrCloud role - min_ansible_version: 2.2 + min_ansible_version: 2.2.1.0 license: Apache 2.0 platforms: - name: Debian versions: - - jessie \ No newline at end of file + - jessie + - stretch diff --git a/molecule.yml b/molecule.yml index a8b0c56..0383750 100644 --- a/molecule.yml +++ b/molecule.yml @@ -37,7 +37,9 @@ vagrant: - "landrush.tld = 'vm'" - "landrush.guest_redirect_dns = true" platforms: - - name: Debian + - name: Debian9 + box: debian/stretch64 + - name: Debian8 box: debian/jessie64 providers: diff --git a/tasks/install.yml b/tasks/install.yml index cc0882e..369309f 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -43,7 +43,7 @@ url: "{{ solr_cloud_url }}" dest: /tmp/{{ solr_cloud_package }} when: | - "Loaded: not-found" in service_solrcloud_status.stdout or + service_solrcloud_status.rc > 0 or service_solrcloud_status | success and (solrcloud_check | failed or "{{ solr_cloud_version }}" not in solrcloud_check.content) @@ -53,7 +53,7 @@ args: chdir: /tmp when: | - "Loaded: not-found" in service_solrcloud_status.stdout or + service_solrcloud_status.rc > 0 or service_solrcloud_status | success and (solrcloud_check | failed or "{{ solr_cloud_version }}" not in solrcloud_check.content) @@ -63,7 +63,7 @@ - name: SolrCloud | Execute SolrCloud installation script shell: /tmp/install_solr_service.sh /tmp/{{ solr_cloud_package }} -f -u {{ solr_user }} -n when: | - "Loaded: not-found" in service_solrcloud_status.stdout or + service_solrcloud_status.rc > 0 or service_solrcloud_status | success and (solrcloud_check | failed or "{{ solr_cloud_version }}" not in solrcloud_check.content) diff --git a/tests/group_vars/group01.yml b/tests/group_vars/group01.yml index c124c49..e95840a 100644 --- a/tests/group_vars/group01.yml +++ b/tests/group_vars/group01.yml @@ -1,7 +1,8 @@ --- +java_implementation: openjdk + solr_cloud_version: 6.5.0 solr_port: 8983 solr_zookeeper_hosts: zookeeper.vm:2181 solr_host: "{{ hostvars[ansible_nodename + '.vm']['ansible_' + ansible_default_ipv4.alias]['ipv4']['address'] }}" - diff --git a/tests/requirements.yml b/tests/requirements.yml index 79b204f..0e41186 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -1,9 +1,9 @@ -- src: https://github.com/idealista-tech/java-role +- src: https://github.com/idealista/java-role scm: git - version: 1.1.0 + version: 1.2.0 name: java -- src: https://github.com/idealista-tech/zookeeper-role +- src: https://github.com/idealista/zookeeper-role scm: git version: 1.0.3 name: zookeeper