Merge pull request #4 from rossmcdonald/updates

Cluster Control Update

defaults/main.yml

@@ -2,6 +2,8 @@
 # Channel of InfluxDB to install (stable, unstable, nightly)
 influxdb_install_version: stable
 
+influxdb_start_service: yes
+
 # If multiple servers are specified, whether to create a clustered configuration
 # NOTE:
 #   - Do not attempt to cluster previously-unclustered servers. This can lead to data loss.

tasks/configure.yml

@@ -32,4 +32,5 @@
     enabled: yes
   notify:
     - pause
+  when: influxdb_start_service == True
 

templates/etc/default/influxdb.j2

-INFLUXD_OPTS="-hostname {{ ansible_hostname }}{% if influxdb_cluster_servers %} -join {% for host in groups['all']|sort %}{% if hostvars[host]['ansible_hostname'] != ansible_hostname %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}"
+INFLUXD_OPTS="-hostname {{ ansible_hostname }}{% if influxdb_cluster_servers %} -join {% for host in groups['influxdb']|sort %}{% if hostvars[host]['ansible_hostname'] != ansible_hostname %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}"

templates/influxdb.conf.j2

@@ -17,7 +17,11 @@ reporting-disabled = {{ influxdb_disable_reporting }}
 
 [meta]
   dir = "{{ influxdb_meta_dir }}"
+{% if influxdb_cluster_servers %}
   hostname = "{{ ansible_hostname }}"
+{% else %}
+  hostname = "localhost"
+{% endif %}
   bind-address = ":{{ influxdb_meta_port }}"
   retention-autocreate = {{ influxdb_meta_retention_autocreate }}
   election-timeout = "{{ influxdb_meta_election_timeout }}"

test.yml

@@ -3,6 +3,11 @@
     - defaults/main.yml
     - vars/main.yml
   tasks:
+    - name: Add all hosts to influxdb group
+      add_host:
+        name: "{{ ansible_hostname }}"
+        groups: influxdb
+    
     - include: tasks/main.yml
   handlers:
     - include: handlers/main.yml