openstack
/
openstack-ansible-os_ceilometer
Code Issues Proposed changes

Remove deprecated ansible_ssh_host variable 

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: I9afd09d4c76febea5896cf6bf7bc284dabea38c3
Related-Bug: #1636606
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-10-25 14:36:37 -05:00 committed by Kevin Carter (cloudnull)
parent 2ef2b9e735
commit c1671ea0ce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/ceilometer.conf.j2
View File

@ -95,7 +95,7 @@ messaging_urls = rabbit://{{ keystone_rabbitmq_telemetry_userid }}:{{ keystone_r
{% if swift_ceilometer_enabled %}
# Ceilometer notifications
{% for host in groups[swift_rabbitmq_telemetry_host_group] %}
messaging_urls = rabbit://{{ swift_rabbitmq_telemetry_userid }}:{{ swift_rabbitmq_telemetry_password }}@{{ hostvars[host]['ansible_ssh_host'] }}:{{ swift_rabbitmq_telemetry_port }}/{{ swift_rabbitmq_telemetry_vhost }}
messaging_urls = rabbit://{{ swift_rabbitmq_telemetry_userid }}:{{ swift_rabbitmq_telemetry_password }}@{{ hostvars[host]['ansible_host'] }}:{{ swift_rabbitmq_telemetry_port }}/{{ swift_rabbitmq_telemetry_vhost }}
{% endfor %}
{% endif %}

2
tests/test-install-mongodb.yml
View File

@ -57,7 +57,7 @@
- mongodb_restart | changed
- name: Test mongodb connectivity
command: "mongo --host {{ ansible_ssh_host }} --eval ' '"
command: "mongo --host {{ ansible_host }} --eval ' '"
changed_when: False
- name: Add admin user