Merge "Added possibility to specify ssh username and port for ceph mons."

This commit is contained in:
Zuul 2018-08-19 19:54:16 +00:00 committed by Gerrit Code Review
commit 8b08110d1a
4 changed files with 8 additions and 0 deletions

View File

@ -56,6 +56,9 @@ cephx: true
# A list of the IP addresses for your Ceph monitors
ceph_mons: []
# User, wich is used for establishing SSH connection to ceph_mons
ceph_mon_user: "{{ ansible_user }}"
# Path to local ceph.conf file
# Leave this commented to obtain a ceph.conf from one of the monitors defined in ceph_mons
#ceph_conf_file: |

View File

@ -25,6 +25,7 @@
changed_when: false
delegate_to: '{{ ceph_mon_host }}'
register: ceph_client_keyrings
remote_user: '{{ ceph_mon_user }}'
until: ceph_client_keyrings is success
retries: 3
tags:
@ -79,6 +80,7 @@
- inventory_hostname in groups.nova_compute
changed_when: false
delegate_to: '{{ ceph_mon_host }}'
remote_user: '{{ ceph_mon_user }}'
register: ceph_nova_secret
tags:
- always

View File

@ -26,6 +26,7 @@
src: /etc/ceph/ceph.conf
register: ceph_conf_content_mon
delegate_to: '{{ ceph_mon_host }}'
remote_user: '{{ ceph_mon_user }}'
changed_when: false
when:
- ceph_conf_file is not defined

View File

@ -20,6 +20,8 @@
-o ConnectTimeout=6
-o UserKnownHostsFile=/dev/null
-o StrictHostKeyChecking=no
-l "{{ ceph_mon_user }}"
-p "{{ ansible_port }}"
{{ item }}
exit
with_items: "{{ ceph_mons }}"