diff --git a/defaults/main.yml b/defaults/main.yml index 523822b..5eac29f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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: | diff --git a/tasks/ceph_auth.yml b/tasks/ceph_auth.yml index 5c61c14..23a642d 100644 --- a/tasks/ceph_auth.yml +++ b/tasks/ceph_auth.yml @@ -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 diff --git a/tasks/ceph_config.yml b/tasks/ceph_config.yml index 219f886..34c146f 100644 --- a/tasks/ceph_config.yml +++ b/tasks/ceph_config.yml @@ -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 diff --git a/tasks/ceph_get_mon_host.yml b/tasks/ceph_get_mon_host.yml index 341be90..b24b1ff 100644 --- a/tasks/ceph_get_mon_host.yml +++ b/tasks/ceph_get_mon_host.yml @@ -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 }}"