Merge pull request #6 from ansiblebit/2.24.x

sync with primogen v24

.gitignore

@@ -1,5 +1,5 @@
 *.retry
-**/dependencies/*
+**/roles/*
 
 # Created by https://www.gitignore.io
 

.travis.yml

@@ -3,6 +3,18 @@ sudo: yes
 
 matrix:
   include:
+    - python: 3.6
+      env: TOXENV=py36-ansible27
+    - python: 3.6
+      env: TOXENV=py36-ansible26
+    - python: 3.6
+      env: TOXENV=py36-ansible25
+    - python: 2.7
+      env: TOXENV=py27-ansible24
+    - python: 2.7
+      env: TOXENV=py27-ansible23
+    - python: 2.7
+      env: TOXENV=py27-ansible22
     - python: 2.7
       env: TOXENV=py27-ansible21
     - python: 2.7
@@ -17,12 +29,23 @@ script:
   - tox
 
 notifications:
-    webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  email: false
+  slack:
+    template:
+      - "%{repository_name}@%{branch} %{commit} : [%{build_number}] %{result} "
+      - "%{build_url}"
+      - "'%{commit_subject}' by %{author}"
+      - "%{elapsed_time} : %{duration}"
+      - "%{message}"
+    rooms:
+      secure:xxx
+    on_success: always
+    on_failure: always
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
 
 before_cache:
-  - rm -f ${HOME}/.cache/pip/log/debug.log
+  - "find ${HOME}/.pip -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}"
 
 cache:
   directories:
-    - ${HOME}/.cache/pip
-
+    - "${HOME}/.cache/pip"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016, ansiblebit
+Copyright (c) 2016-2018, ansiblebit
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -10,7 +10,6 @@
 
 [Ansible][ansible] role to setup [InfluxDB][influxdb].
 
-
 ## Tests
 
 | Family | Distribution | Version | Test Status |
@@ -22,46 +21,42 @@
 | Debian | Ubuntu  | Precise | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
 | Debian | Ubuntu  | Vivid   | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
 
-
 ## Requirements
 
 - ansible >= 1.9.6
 
-
 ## Role Variables
 
 - **influxdb_apt_dependencies**: packages needed to be able to run this playbook or install [InfluxDB][influxdb].
 - **influxdb_configuration**: the contents of the [InfluxDB][influxdb] configuration file.
-- **influxdb_admin_port**: the port where the [InfluxDB][influxdb] admin interface will be running.
 - **influxdb_conf_file**: the location where the [InfluxDB][influxdb] is located.
 - **influxdb_group**: the [InfluxDB][influxdb] group.
 - **influxdb_http_port**: the port where the [InfluxDB][influxdb] HTTP API will be running.
+- **influxdb_ifql_port**: the port where the [InfluxDB][influxdb] ifql RPC service will be running.
+- **influxdb_rpc_port**: the port where the [InfluxDB][influxdb] RPC service will be running.
+- **influxdb_udp_port**: the port where the [InfluxDB][influxdb] UDP listener will be running.
 - **influxdb_user**: the [InfluxDB][influxdb] user.
 - **influxdb_version**: the [InfluxDB][influxdb] version to be installed.
 
 Unless stated otherwise a default value is provided for each of the variables mentioned above in the `defaults` directory.
 
-
 ## Dependencies
 
 None.
 
-
 ## Playbooks
 
     - hosts: servers
       roles:
          - role: ansiblebit.influxdb
 
-
 ## Tags
 
 - **configuration**: configuration tasks.
 - **debug**: task to debug role variables.
 - **installation**: installation tasks.
 - **validation**: task to validate role variables.
 
-
 ## Test
 
 To run the tests you will need to install:
@@ -71,21 +66,21 @@ To run the tests you will need to install:
 
 To run all tests against all pre-defined OS/distributions * ansible versions:
 
-```
-$ tox
+```bash
+tox
 ```
 
 To run tests for `trusty64`:
 
-```
+```bash
 $ cd tests
 $ bash test_idempotence.sh --box trusty64.vagrant.dev
 # log file will be stores under tests/log
 ```
 
 To perform debugging on a specific environment:
 
-```
+```bash
 $ cd tests
 $ vagrant up trusty64.vagrant.dev
 
@@ -96,22 +91,10 @@ $ vagrant provision trusty64.vagrant.dev
 $ vagrant ssh trusty64.vagrant.dev
 ```
 
-
 ## Links
 
 - [[InfluxDB][influxdb] : Introduction > Installation](https://docs.influxdata.com/influxdb/v0.13/introduction/installation/)
 
-
-## License
-
-[BSD][license]
-
-
-## Author Information
-
-- [steenzout][steenzout]
-
-
 [ansible]:      https://www.ansible.com         "Ansible"
 [license]:      https://github.com/ansiblebit/influxdb/blob/master/LICENSE  "BSD license"
 [influxdb]:     https://influxdata.com          "InfluxDB"