aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-13 16:15:49 +0000
committerGerrit Code Review <review@openstack.org>2018-03-13 16:15:49 +0000
commiteebbfdc12a159d2f7dc14f75a450a33b5be46441 (patch)
tree49f2d9a344b46223eafe2f3b750495ad77b3b0d8
parent16b78ec12591cd1fab09ee0b2aadba1a09314e1e (diff)
parent01a538816998d7fc676015873d112354c0a339f7 (diff)
downloadkolla-eebbfdc12a159d2f7dc14f75a450a33b5be46441.tar.gz
kolla-eebbfdc12a159d2f7dc14f75a450a33b5be46441.zip
Merge "Verify YAML syntax in gates"
-rw-r--r--.yamllint9
-rw-r--r--.zuul.d/base.yaml1
-rw-r--r--.zuul.d/centos.yaml1
-rw-r--r--releasenotes/notes/add-congress-877644b4b0e2ed0a.yaml6
-rw-r--r--releasenotes/notes/add-watcher-a97995ace827cf71.yaml10
-rw-r--r--releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml3
-rw-r--r--releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml1
-rw-r--r--roles/collectd/defaults/main.yml1
-rw-r--r--roles/collectd/handlers/main.yml1
-rw-r--r--tests/playbooks/post.yml1
-rw-r--r--tests/playbooks/pre.yml1
-rw-r--r--tests/playbooks/run.yml1
-rw-r--r--tox.ini4
13 files changed, 28 insertions, 12 deletions
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 000000000..de74ae3a9
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,9 @@
+extends: default
+ignore: |
+ .tox/
+
+rules:
+ line-length: disable
+ truthy: disable
+ braces:
+ max-spaces-inside: 1
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index fa09343a4..8ac4dff9c 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -53,4 +53,3 @@
- ^doc/.*
vars:
publisher: false
-
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 64bb42a2f..0f543ed95 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -56,4 +56,3 @@
publisher: true
secrets:
- kolla_dockerhub_creds
-
diff --git a/releasenotes/notes/add-congress-877644b4b0e2ed0a.yaml b/releasenotes/notes/add-congress-877644b4b0e2ed0a.yaml
index 4a150d094..4e500c783 100644
--- a/releasenotes/notes/add-congress-877644b4b0e2ed0a.yaml
+++ b/releasenotes/notes/add-congress-877644b4b0e2ed0a.yaml
@@ -1,5 +1,5 @@
---
features:
-- Add ansible role for openstack congress project which provide
- policy as a service across any collection of cloud services in
- order to offer governance and compliance for dynamic infrastructures.
+ - Add ansible role for openstack congress project which provide
+ policy as a service across any collection of cloud services in
+ order to offer governance and compliance for dynamic infrastructures.
diff --git a/releasenotes/notes/add-watcher-a97995ace827cf71.yaml b/releasenotes/notes/add-watcher-a97995ace827cf71.yaml
index 4e081ddeb..3d4c1738b 100644
--- a/releasenotes/notes/add-watcher-a97995ace827cf71.yaml
+++ b/releasenotes/notes/add-watcher-a97995ace827cf71.yaml
@@ -1,6 +1,6 @@
---
- features:
- - Introduce OpenStack Infrastructure Optimization
- service, also known as Watcher. This project makes
- use of Ceilometer data to rebalance the cloud to
- meet declared goals and strategies.
+features:
+ - Introduce OpenStack Infrastructure Optimization
+ service, also known as Watcher. This project makes
+ use of Ceilometer data to rebalance the cloud to
+ meet declared goals and strategies.
diff --git a/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml b/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml
index 1ea4e38fd..0109d8a99 100644
--- a/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml
+++ b/releasenotes/notes/congress-broken-cbf8ca59d90a85cb.yaml
@@ -1,3 +1,4 @@
+---
other:
- Congress doesn't work correctly out of the box and will
- not deploy. See Bug #1634641.
+ not deploy. See Bug https://bugs.launchpad.net/kolla-ansible/+bug/1634641.
diff --git a/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml b/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml
index 4c3edc81b..cac52af87 100644
--- a/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml
+++ b/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml
@@ -2,4 +2,3 @@
deprecations:
- The nova-network service was deprecated, we remove it from
the nova container.
-
diff --git a/roles/collectd/defaults/main.yml b/roles/collectd/defaults/main.yml
index 5f5bceafc..0cbb0e858 100644
--- a/roles/collectd/defaults/main.yml
+++ b/roles/collectd/defaults/main.yml
@@ -1,3 +1,4 @@
+---
collectd_packages:
RedHat:
- collectd
diff --git a/roles/collectd/handlers/main.yml b/roles/collectd/handlers/main.yml
index 4ca4e94ce..3ec96219c 100644
--- a/roles/collectd/handlers/main.yml
+++ b/roles/collectd/handlers/main.yml
@@ -1,3 +1,4 @@
+---
- name: restart collectd service
service:
name: collectd
diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml
index 8f3735111..413d3f757 100644
--- a/tests/playbooks/post.yml
+++ b/tests/playbooks/post.yml
@@ -1,3 +1,4 @@
+---
- hosts: all
roles:
- collect-collectd
diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index 40f3f1213..b368ebda0 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -1,3 +1,4 @@
+---
- hosts: all
become: true
roles:
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index 92af9d639..5d9b40f63 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -1,3 +1,4 @@
+---
- hosts: all
vars:
kolla_inventory_path: "{{ zuul.project.src_dir }}/inventory"
diff --git a/tox.ini b/tox.ini
index a3e0df0ff..3f63d244d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,12 +31,16 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
coverage report --show-missing
[testenv:pep8]
+deps =
+ {[testenv]deps}
+ yamllint
commands =
{toxinidir}/tools/run-bashate.sh
flake8 {posargs}
{toxinidir}/tools/validate-all-dockerfiles.sh
python {toxinidir}/tools/validate-all-file.py
bandit -r docker kolla tests tools
+ yamllint .
[testenv:bandit]
commands = bandit -r docker kolla tests tools