Merge pull request #1973 from ceph/refact_ceph-defaults

defaults: change running order in main.yml

roles/ceph-defaults/tasks/facts.yml

@@ -15,7 +15,7 @@
 # because it blindly picks a mon, which may be down because
 # of the rolling update
 - name: is ceph running already?
-  command: ceph --connect-timeout 3 --cluster {{ cluster }} fsid
+  command: "{{ docker_exec_cmd }} ceph --connect-timeout 3 --cluster {{ cluster }} fsid"
   changed_when: false
   failed_when: false
   always_run: yes
@@ -92,12 +92,6 @@
   when:
     - generate_fsid
 
-- name: set_fact docker_exec_cmd
-  set_fact:
-    docker_exec_cmd: "docker exec ceph-mon-{{ ansible_hostname }}"
-  when:
-    - containerized_deployment
-
 - name: set_fact mds_name ansible_hostname
   set_fact:
     mds_name: "{{ ansible_hostname }}"

roles/ceph-defaults/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: include facts.yml
-  include: facts.yml
-
 - name: include check_socket.yml
   include: check_socket.yml
+
+- name: include facts.yml
+  include: facts.yml