openstack/openstack-ansible-ops
Code Issues Proposed changes

Remove deprecated ansible_ssh_host variable

Browse Source 
This changes 'ansible_ssh_host' to 'ansible_host'. The 'ansible_ssh_host'
variable has been deprecated as noted here: [0].

[0] - http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups

Change-Id: Ie34bb924b55d4e1c7b4568c2eadd2a7a1a60a821
Related-Bug: #1636606
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-10-25 14:36:21 -05:00 committed by Kevin Carter (cloudnull)
parent c8f1af0bcf
commit baf0553a36
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster_metrics/playbook-influx-db.yml
View File

@ -49,7 +49,7 @@
state: restarted state: restarted
- name: Wait for influxdb to be ready - name: Wait for influxdb to be ready
wait_for: wait_for:
host: "{{ hostvars[groups['cluster-metrics'][0]]['ansible_ssh_host'] }}" host: "{{ hostvars[groups['cluster-metrics'][0]]['ansible_host'] }}"
port: "{{ influxdb_port }}" port: "{{ influxdb_port }}"
delay: 1 delay: 1
- name: Create metrics DB - name: Create metrics DB

2
cluster_metrics/templates/kapacitor.conf.j2
View File

@ -27,7 +27,7 @@ data_dir = "/var/lib/kapacitor"
enabled = true enabled = true
name = "[% influxdb_db_name %]" name = "[% influxdb_db_name %]"
default = true default = true
urls = ["http://[% hostvars[groups['cluster-metrics'][0]]['ansible_ssh_host'] %]:[% influxdb_port %]"] urls = ["http://[% hostvars[groups['cluster-metrics'][0]]['ansible_host'] %]:[% influxdb_port %]"]
username = "[% influxdb_db_root_name %]" username = "[% influxdb_db_root_name %]"
password = "[% influxdb_db_root_password %]" password = "[% influxdb_db_root_password %]"
ssl-ca = "" ssl-ca = ""

2
cluster_metrics/templates/telegraf.conf.j2
View File

@ -23,7 +23,7 @@
omit_hostname = false omit_hostname = false
[[outputs.influxdb]] [[outputs.influxdb]]
urls = ["http://{{ hostvars[groups['cluster-metrics'][0]]['ansible_ssh_host'] }}:{{ influxdb_port }}"] urls = ["http://{{ hostvars[groups['cluster-metrics'][0]]['ansible_host'] }}:{{ influxdb_port }}"]
database = "{{ influxdb_db_name }}" database = "{{ influxdb_db_name }}"
precision = "s" precision = "s"
write_consistency = "any" write_consistency = "any"