From: Zack Cerza Date: Wed, 11 Sep 2019 15:54:36 +0000 (-0600) Subject: Revert comparison "fix" from ansible-lint X-Git-Tag: v2.0.8^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F246%2Fhead;p=cephmetrics.git Revert comparison "fix" from ansible-lint In d737083, we thought we were fixing something, but it turns out the comparison suggested will throw an error if container_name contains a dash (which it likely will). Revert the change and instruct ansible-lint to not complain about that error on that line. Resolves: rhbz#1731919 Signed-off-by: Zack Cerza --- diff --git a/ansible/roles/ceph-mgr/tasks/main.yml b/ansible/roles/ceph-mgr/tasks/main.yml index d0c0f04..80a709c 100644 --- a/ansible/roles/ceph-mgr/tasks/main.yml +++ b/ansible/roles/ceph-mgr/tasks/main.yml @@ -26,7 +26,7 @@ - name: Prefix the mgr command with a docker command set_fact: mgr_prefix: "docker exec {{ container_name }}" - when: container_name + when: container_name != "" # noqa 602 - name: Enable mgr prometheus module command: "{{ mgr_prefix|default('') }} ceph --cluster {{ cluster_name }} mgr module enable prometheus"