Merge "clear yamllint errors under stx-config Listed below are the errors which were fixed as well as the actions [error] trailing spaces (trailing-spaces) --> delete spaces [error] too many blank lines (3 > 2) --> delete blank line [error] too few spaces after comma (commas) --> add space after comma [error] too many spaces inside brackets --> delete extra spaces [error] wrong indentation: expected XX but found XX (indentation) --> delete/add spaces to indente [error] line too long (97 > 80 characters) (line-length) --> change the line max length to 200 cut the too long lines to 2 or 3 (by using '|-') [error] duplication of key "XXX" in mapping (key-duplicates) --> delete the duplication [warning] missing starting space in comment (comments) --> add blank after '#' [warning] truthy value should be true or false (truthy) --> lower case "False"/"True" to false/true"

.yamllint

@@ -0,0 +1,8 @@
+---
+extends: default
+
+rules:
+  # 80 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 200
+    level: warning

puppet-manifests/src/hieradata/controller.yaml

@@ -536,4 +536,3 @@ fm::db::sync::user: 'root'
 fm::database_idle_timeout: 60
 fm::database_max_overflow: 20
 fm::database_max_pool_size: 1
-

puppet-manifests/src/hieradata/global.yaml

@@ -42,14 +42,8 @@ neutron::vlan_transparent: true
 neutron::pnet_audit_enabled: false
 
 neutron::verbose: false
-neutron::root_helper: 'sudo'
 neutron::log_dir: false
 neutron::use_syslog: true
-neutron::host_driver: 'neutron.plugins.wrs.drivers.host.DefaultHostDriver'
-neutron::fm_driver: 'neutron.plugins.wrs.drivers.fm.DefaultFmDriver'
-neutron::vlan_transparent: true
-neutron::state_path: '/var/run/neutron'
-neutron::lock_path: '/var/run/neutron/lock'
 neutron::notification_driver: ['messagingv2']
 neutron::dns_domain: 'openstacklocal'
 
@@ -59,7 +53,6 @@ nova::use_syslog: true
 nova::debug: false
 nova::log_facility: 'local6'
 nova::notification_driver: 'messagingv2'
-nova::notify_on_state_change: 'vm_and_task_state'
 nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
 nova::notify_on_state_change: 'vm_and_task_state'
 

tox.ini

@@ -24,11 +24,11 @@ commands =
          -print0 | xargs -0 bashate -v -e E*  \
          -i E006,E010"
 
-#  bash -c "find {toxinidir}        \
-#        \( -name .tox -prune \)         \
-#        -o -type f -name '*.yaml'       \
-#        -print0 | xargs -0 yamllint -f parsable \
-#        -c {toxinidir}/.yamllint"
+  bash -c "find {toxinidir}        \
+        \( -name .tox -prune \)         \
+        -o -type f -name '*.yaml'       \
+        -print0 | xargs -0 yamllint -f parsable \
+        -c {toxinidir}/.yamllint"
 
 [testenv:pep8]
 usedevelop = False