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

These changes are causing integrated build failures due to undefined
variables. Reverting them to work out a better solution.

This reverts commit 8ec0e6c793
This reverts commit 58ac4da336.
Change-Id: I4964625b6513eb062a6ce0513bd01b17922b8188
This commit is contained in:
Dmitriy Rabotjagov 2018-08-20 17:16:49 +03:00 committed by Jesse Pretorius (odyssey4me)
parent 8ec0e6c793
commit 27d5b8d0bb
4 changed files with 0 additions and 8 deletions

View File

@ -56,9 +56,6 @@ 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,7 +25,6 @@
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:
@ -80,7 +79,6 @@
- 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,7 +26,6 @@
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,8 +20,6 @@
-o ConnectTimeout=6
-o UserKnownHostsFile=/dev/null
-o StrictHostKeyChecking=no
-l "{{ ceph_mon_user }}"
-p "{{ ansible_port|default('22') }}"
{{ item }}
exit
with_items: "{{ ceph_mons }}"