From: Sébastien Han <seb@redhat.com>
Date: Wed, 9 Nov 2016 08:53:22 +0000 (+0100)
Subject: Merge pull request #1082 from albertomurillo/v2.2
X-Git-Tag: v2.0~2^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=200388d5324b33f1d85a018d854395ad994d0a2b;p=ceph-ansible.git

Merge pull request #1082 from albertomurillo/v2.2

sync config_template plugin with master branch
---

200388d5324b33f1d85a018d854395ad994d0a2b
diff --cc roles/ceph-common/tasks/facts.yml
index 4491f6874,4491f6874..dd6129517
--- a/roles/ceph-common/tasks/facts.yml
+++ b/roles/ceph-common/tasks/facts.yml
@@@ -2,7 -2,7 +2,7 @@@
  - name: get ceph version
    command: ceph --version
    changed_when: false
--  always_run: true
++  check_mode: no
    register: ceph_version
  
  - set_fact:
@@@ -12,7 -12,7 +12,7 @@@
  - name: check init system
    slurp:
      src: /proc/1/comm
--  always_run: true
++  check_mode: no
    register: init_system
  
  - set_fact:
diff --cc roles/ceph-common/tasks/misc/system_tuning.yml
index b63d4096e,b63d4096e..5b38a63b3
--- a/roles/ceph-common/tasks/misc/system_tuning.yml
+++ b/roles/ceph-common/tasks/misc/system_tuning.yml
@@@ -14,7 -14,7 +14,7 @@@
    command: sysctl -b vm.min_free_kbytes
    changed_when: false
    failed_when: false
--  always_run: true
++  check_mode: no
    register: default_vm_min_free_kbytes
  
  - name: define vm.min_free_kbytes