Skip to content

Commit

Permalink
Merge pull request #97 from idealista/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sorobon authored Oct 31, 2019
2 parents 46a4159 + 9ff3e35 commit 012a373
Show file tree
Hide file tree
Showing 25 changed files with 957 additions and 470 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ tests/__pycache__
.vagrant
.cache
.python-version
Pipfile
Pipfile.lock
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
language: python
python: "2.7.13"
python: "3.7"
sudo: required
services:
- docker
install:
- pip install pipenv
- pipenv install -r test-requirements.txt --python 2.7
- pipenv sync
script:
- pipenv run molecule test --all

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.

## [Unreleased](https://github.com/idealista/solrcloud-role/tree/develop)

## [2.3.0](https://github.com/idealista/solrcloud-role/tree/2.3.0) (2019-10-31)
- *[#94] Upgrade to solr 8.2.0* @sorobon

## [2.2.0](https://github.com/idealista/solrcloud-role/tree/2.2.0) (2019-06-19)
### Added
- *[#80](https://github.com/idealista/solrcloud-role/issues/80) External libs support added* @sorobon
Expand Down
14 changes: 14 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
ansible = "==2.8.6"
molecule = "==2.22"
docker = "==4.1.0"

[dev-packages]

[requires]
python_version = "3"
677 changes: 677 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

78 changes: 77 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
---

## General
solr_version: 8.1.1
solr_version: 8.2.0
solrcloud_install: true

## Service options

# Owner
solr_user: solr
solr_group: solr
solr_user_uid: 810
solr_group_gid: 810

# start on boot
solr_service_enabled: true
Expand Down Expand Up @@ -89,3 +91,77 @@ solr_collections_transfer_mode: synchronize # synchronize, copy
# External libs support
solr_external_libraries_repository_url: http://repo1.maven.org/maven2
solr_external_libraries: {}

solr_ulimit_checks: 65000

solr_metrics:
hidden_props:
- "javax.net.ssl.keyStorePassword"
- "javax.net.ssl.trustStorePassword"
- "basicauth"
- "zkDigestPassword"
- "zkDigestReadonlyPassword"
reporters:
- name: "jmx_metrics"
domain: jmx_exporter
class: "org.apache.solr.metrics.reporters.SolrJmxReporter"
### LOGGER METRICS
# - name: "log_metrics"
# group: core
# class: "org.apache.solr.metrics.reporters.SolrSlf4jReporter"
# config:
# - name: "period"
# value: 60
# type: "int"
# - name: "filter"
# value: "QUERY./select.requestTimes"
# type: "str"
# - name: "filter"
# value: "QUERY./get.requestTimes"
# type: "str"
# - name: "filter"
# value: "UPDATE./update.requestTimes"
# type: "str"
# - name: "filter"
# value: "UPDATE./update.clientErrors"
# type: "str"
# - name: "filter"
# value: "UPDATE./update.errors"
# type: "str"
# - name: "filter"
# value: "SEARCHER.new.time"
# type: "str"
# - name: "filter"
# value: "SEARCHER.new.warmup"
# type: "str"
# - name: "logger"
# value: "org.apache.solr.metrics.reporters.SolrSlf4jReporter"
# type: "str"

solr_backup_repository:
name: local
class: org.apache.solr.core.backup.repository.LocalFileSystemRepository
default: "false"
config:
- name: "location"
value: "${solr.default.backup.path:}"
type: str

### HDFS EXAMPLE
# solr_backup_repository:
# name: hdfs
# class: org.apache.solr.core.backup.repository.HdfsBackupRepository
# default: "false"
# config:
# - name: "location"
# value: "${solr.hdfs.default.backup.path:}"
# type: str
# - name: "solr.hdfs.home"
# value: "${solr.hdfs.home:}"
# type: str
# - name: "solr.hdfs.confdir"
# value: "${solr.hdfs.confdir:}"
# type: str
# - name: "solr.hdfs.buffer.size"
# value: "262144"
# type: int
69 changes: 0 additions & 69 deletions molecule/default/create.yml

This file was deleted.

33 changes: 0 additions & 33 deletions molecule/default/destroy.yml

This file was deleted.

24 changes: 17 additions & 7 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,36 @@ platforms:
- name: zookeeper
hostname: zookeeper
image: idealista/zookeeper:latest
privileged: true
privileged: false
capabilities:
- SYS_ADMIN
volumes:
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
tmpfs:
- '/run'
- '/run/lock'
groups:
- zookeeper_group
command: '/lib/systemd/systemd'
stop_signal: 'RTMIN+3'
networks:
- name: solr-network
aliases:
- zookeeper

- name: solrcloud1
hostname: solrcloud1
image: idealista/jdk:8u181-stretch-openjdk-headless
privileged: true
image: idealista/jdk:8u222-stretch-openjdk-headless
privileged: false
capabilities:
- SYS_ADMIN
volumes:
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
tmpfs:
- '/run'
- '/run/lock'
groups:
- solrcloud
command: '/lib/systemd/systemd'
stop_signal: 'RTMIN+3'
networks:
- name: solr-network
aliases:
Expand All @@ -42,15 +48,19 @@ platforms:

- name: solrcloud2
hostname: solrcloud2
image: idealista/jdk:8u181-stretch-openjdk-headless
privileged: true
image: idealista/jdk:8u222-stretch-openjdk-headless
privileged: false
capabilities:
- SYS_ADMIN
volumes:
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
tmpfs:
- '/run'
- '/run/lock'
groups:
- solrcloud
command: '/lib/systemd/systemd'
stop_signal: 'RTMIN+3'
networks:
- name: solr-network
aliases:
Expand Down
69 changes: 0 additions & 69 deletions molecule/setup_with_collections/create.yml

This file was deleted.

Loading

0 comments on commit 012a373

Please sign in to comment.