From: Zack Cerza Date: Tue, 4 Jun 2019 22:57:35 +0000 (-0600) Subject: ansible-lint: Ignore these lines' length X-Git-Tag: v2.0.3~3^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89f6f23027c38a51d3a0b092c8989f0259f08fce;p=cephmetrics.git ansible-lint: Ignore these lines' length Signed-off-by: Zack Cerza --- diff --git a/ansible/playbook.yml b/ansible/playbook.yml index 3cff291..1740ee2 100644 --- a/ansible/playbook.yml +++ b/ansible/playbook.yml @@ -79,4 +79,4 @@ tasks: - name: Print dashboard URL debug: - msg: "All done! You may access your dashboard at http://{{ groups['ceph-grafana'][0] }}:3000/ with your pre-defined user and password (admin/admin by default). Note that initially the dashboard will be incomplete; after a few minutes it should have enough data collected to function properly." + msg: "All done! You may access your dashboard at http://{{ groups['ceph-grafana'][0] }}:3000/ with your pre-defined user and password (admin/admin by default). Note that initially the dashboard will be incomplete; after a few minutes it should have enough data collected to function properly." # noqa 204 diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml index 9a295db..4b94b80 100644 --- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml +++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml @@ -44,7 +44,7 @@ dest: "{{ collectd_conf_d }}/cephmetrics.conf" regexp: 'EventURL ".*"' insertafter: 'ClusterName ".*"' - line: " EventURL \"http://{{ groups['ceph-grafana'][0] }}:{{ graphite.web_port if graphite.service == 'graphite-web' else graphite.api_port }}/events/\"" + line: " EventURL \"http://{{ groups['ceph-grafana'][0] }}:{{ graphite.web_port if graphite.service == 'graphite-web' else graphite.api_port }}/events/\"" # noqa 204 notify: Restart collectd - name: Set ModulePath in cephmetrics.conf diff --git a/ansible/roles/ceph-grafana/tasks/push_dashboards.yml b/ansible/roles/ceph-grafana/tasks/push_dashboards.yml index a2b5f22..2672066 100644 --- a/ansible/roles/ceph-grafana/tasks/push_dashboards.yml +++ b/ansible/roles/ceph-grafana/tasks/push_dashboards.yml @@ -28,7 +28,7 @@ # ... and so on - name: Set dashboards var keys set_fact: - dashboards: "{% for item in dashboard_files.results %}{{ dashboards.update({item.stat.path.split('/')[-1].split('.')[:-1]|join('.'): {'body': lookup('file', item.stat.path)|from_json }}) }}{% endfor %}{{ dashboards }}" + dashboards: "{% for item in dashboard_files.results %}{{ dashboards.update({item.stat.path.split('/')[-1].split('.')[:-1]|join('.'): {'body': lookup('file', item.stat.path)|from_json }}) }}{% endfor %}{{ dashboards }}" # noqa 204 no_log: true # If the dashboards have been previously deployed, we need the ID so that we diff --git a/ansible/roles/ceph-graphite/handlers/main.yml b/ansible/roles/ceph-graphite/handlers/main.yml index 16fc5c6..02b77b4 100644 --- a/ansible/roles/ceph-graphite/handlers/main.yml +++ b/ansible/roles/ceph-graphite/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: Resize whisper databases # xargs -P parallelizes execution; scale it to the number of cores on the system - shell: "find /var/lib/carbon/whisper -name '*.wsp' -print0 | xargs -n1 -0 -P {{ ansible_processor_vcpus }} -I {} whisper-resize {} {{ whisper_retention.replace(',', ' ') }}" + shell: "find /var/lib/carbon/whisper -name '*.wsp' -print0 | xargs -n1 -0 -P {{ ansible_processor_vcpus }} -I {} whisper-resize {} {{ whisper_retention.replace(',', ' ') }}" # noqa 204 register: whisper_resize failed_when: "'Traceback' in whisper_resize.stdout" no_log: true diff --git a/ansible/roles/cephmetrics-common/tasks/merge_vars.yml b/ansible/roles/cephmetrics-common/tasks/merge_vars.yml index f8dbcd0..acfdde0 100644 --- a/ansible/roles/cephmetrics-common/tasks/merge_vars.yml +++ b/ansible/roles/cephmetrics-common/tasks/merge_vars.yml @@ -1,5 +1,5 @@ --- - name: Combine default settings and user-defined variables - set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"} + set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"} # noqa 204 with_items: "{{ defaults.keys() }}" no_log: true