From 5463d730eede7e5af15cdda08d9a0b9e45289a3d Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 18 Jul 2019 14:57:46 -0400 Subject: [PATCH] Remove NBSP characters Some NBSP are still present in the yaml files. Adding a test in travis CI. Signed-off-by: Dimitri Savineau (cherry picked from commit 07c6695d16bc3e8f6d8d5fdc17bd9830b1d94619) --- .travis.yml | 3 ++- roles/ceph-config/templates/ceph.conf.j2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e862e399d..0da38d7d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,6 @@ notifications: install: - pip install -r requirements.txt script: + - if [[ -n $(grep --exclude-dir=.git -P "\xa0" -r .) ]]; then echo 'NBSP characters found'; exit 1; fi - ansible-playbook -i '127.0.0.1,' site.yml.sample --syntax-check --list-tasks -vv - - ansible-playbook -i '127.0.0.1,' site-docker.yml.sample --syntax-check --list-tasks -vv \ No newline at end of file + - ansible-playbook -i '127.0.0.1,' site-docker.yml.sample --syntax-check --list-tasks -vv diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2 index 22b56f450..1984f46b3 100644 --- a/roles/ceph-config/templates/ceph.conf.j2 +++ b/roles/ceph-config/templates/ceph.conf.j2 @@ -148,7 +148,7 @@ filestore xattr use omap = true {% endif %} {% endif %} {% if osd_objectstore == 'bluestore' %} -{% set _num_osds = num_osds | default(0) | int %} +{% set _num_osds = num_osds | default(0) | int %} [osd] {% if is_hci and _num_osds > 0 %} {# hci_safety_factor is the safety factor for HCI deployments #} -- 2.39.5