From 1c7e104ade2855bd0bb2789af48d8569df60fd8b Mon Sep 17 00:00:00 2001 From: Proskurin Kirill Date: Wed, 6 Jul 2016 15:59:09 +0300 Subject: [PATCH] Fixed key duplication in neutron-server Plus added the yamllint to pass gate test Change-Id: I55f40f5a138cb1f43117fa3ec07c34a68b5afea0 --- service/neutron-server.yaml | 2 -- tools/run-check-yaml-syntax.sh | 7 +++++++ tox.ini | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100755 tools/run-check-yaml-syntax.sh diff --git a/service/neutron-server.yaml b/service/neutron-server.yaml index a0f949e..a277ceb 100644 --- a/service/neutron-server.yaml +++ b/service/neutron-server.yaml @@ -21,8 +21,6 @@ service: files: - neutron-server-bootstrap.sh - name: neutron-db-sync - dependencies: - - neutron-bootstrap type: single command: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head dependencies: diff --git a/tools/run-check-yaml-syntax.sh b/tools/run-check-yaml-syntax.sh new file mode 100755 index 0000000..e393c54 --- /dev/null +++ b/tools/run-check-yaml-syntax.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +### Temp yaml syntax checker script. +set -e +for file in $(find . -name '*.yaml'); do + yamllint -d relaxed $file +done diff --git a/tox.ini b/tox.ini index 2a67bb6..7efb0df 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,12 @@ [tox] minversion = 1.6 +envlist = linters,bashate skipsdist = True -envlist = bashate + +[testenv:linters] +deps = yamllint +commands = + {toxinidir}/tools/run-check-yaml-syntax.sh [testenv:bashate] deps = bashate>=0.2