Commit d90fa780 authored by Ross McDonald's avatar Ross McDonald
Browse files

Removed extraneous debug references. Clustering is now fully-supported with 3+...

Removed extraneous debug references. Clustering is now fully-supported with 3+ nodes. Slight modification to default directory permissions, and default influxdb configuration file.
parent 4b4f62af
......@@ -46,10 +46,6 @@
command: influx -execute 'show servers'
register: influxdb_show_servers_output
- name: Display output
debug:
var: influxdb_show_servers_output
- name: Assert clustering status (local/vagrant)
assert:
that:
......
......@@ -6,7 +6,7 @@
state: directory
owner: influxdb
group: influxdb
mode: 0744
mode: 0755
with_items:
- "{{ influxdb_configuration_dir }}"
- "{{ influxdb_meta_dir }}"
......
......@@ -27,9 +27,6 @@
name: influxdb
state: present
when: influxdb_install_url is not defined or influxdb_install_url == None
- name: Debug
debug: var=influxdb_install_url
- name: Download InfluxDB package via URL [Debian/Ubuntu]
command: curl -o /tmp/influxdb-ansible-download.deb {{ influxdb_install_url }}
......
INFLUXD_OPTS="-hostname {{ ansible_hostname }}{% if influxdb_cluster_servers %} -join {% if is_vagrant %}{% for host in groups['all'] if hostvars[host]['ansible_hostname'] != ansible_hostname %}{% if not loop.index > 3 %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.index > 3 and not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}{% if not is_vagrant %}{% for host in groups['influxdb'] if hostvars[host]['ansible_hostname'] != ansible_hostname %}{% if not loop.index > 3 %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.index > 3 and not loop.last %},{% endif %}{% endif %}{% endfor %}{% endif %}{% endif %}"
INFLUXD_OPTS="-hostname {{ ansible_hostname }}{% if influxdb_cluster_servers %} -join {% if is_vagrant %}{% for host in groups['all'] if hostvars[host]['ansible_hostname'] != ansible_hostname %}{% if not loop.index > 2 %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.index > 1 %},{% endif %}{% endif %}{% endfor %}{% endif %}{% if not is_vagrant %}{% for host in groups['influxdb'] if hostvars[host]['ansible_hostname'] != ansible_hostname %}{% if not loop.index > 2 %}{{ hostvars[host]['ansible_hostname'] }}:{{ influxdb_meta_port }}{% if not loop.index > 1 %},{% endif %}{% endif %}{% endfor %}{% endif %}{% endif %}"
......@@ -17,11 +17,7 @@ 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 }}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment