starlingx/config
Code Issues Proposed changes

clear yamllint errors under stx-config

Browse Source 
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

  Listed below are test cases done which run one controller and one compute in KVMs
    Test-Install           ----  success
    Test_create_instance   ----  success

  Now linters errors under stx-config is clear. Weee!!

Related commit: https://review.openstack.org/#/c/600473/

Story: 2003360
Task: 24411

Change-Id: Idc3c9304172be52c5d2fb2cbd862527066b72ecf
Signed-off-by: SidneyAn <ran1.an@intel.com>
This commit is contained in:
SidneyAn 2018-09-10 16:22:23 +08:00
parent 3ff7dd629c
commit 9b78d42e54
5 changed files with 608 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.yamllint Normal file
View File

@ -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

135
puppet-manifests/src/hieradata/controller.yaml
View File

@ -373,39 +373,39 @@ cinder::volume::enabled: false
cinder::backup::posix::backup_posix_path: '/opt/backups' cinder::backup::posix::backup_posix_path: '/opt/backups'
cinder::policy::policies: cinder::policy::policies:
enable_consistencygroup_create: enable_consistencygroup_create:
key: 'consistencygroup:create' key: 'consistencygroup:create'
value: '' value: ''
enable_consistencygroup_delete: enable_consistencygroup_delete:
key: 'consistencygroup:delete' key: 'consistencygroup:delete'
value: '' value: ''
enable_consistencygroup_update: enable_consistencygroup_update:
key: 'consistencygroup:update' key: 'consistencygroup:update'
value: '' value: ''
enable_consistencygroup_get: enable_consistencygroup_get:
key: 'consistencygroup:get' key: 'consistencygroup:get'
value: '' value: ''
enable_consistencygroup_get_all: enable_consistencygroup_get_all:
key: 'consistencygroup:get_all' key: 'consistencygroup:get_all'
value: '' value: ''
enable_consistencygroup_create_cgsnapshot: enable_consistencygroup_create_cgsnapshot:
key: 'consistencygroup:create_cgsnapshot' key: 'consistencygroup:create_cgsnapshot'
value: '' value: ''
enable_consistencygroup_delete_cgsnapshot: enable_consistencygroup_delete_cgsnapshot:
key: 'consistencygroup:delete_cgsnapshot' key: 'consistencygroup:delete_cgsnapshot'
value: '' value: ''
enable_consistencygroup_get_cgsnapshot: enable_consistencygroup_get_cgsnapshot:
key: 'consistencygroup:get_cgsnapshot' key: 'consistencygroup:get_cgsnapshot'
value: '' value: ''
enable_consistencygroup_get_all_cgsnapshots: enable_consistencygroup_get_all_cgsnapshots:
key: 'consistencygroup:get_all_cgsnapshots' key: 'consistencygroup:get_all_cgsnapshots'
value: '' value: ''
enable_snapshot_export_attributes: enable_snapshot_export_attributes:
key: 'volume_extension:snapshot_export_attributes' key: 'volume_extension:snapshot_export_attributes'
value: 'rule:admin_or_owner' value: 'rule:admin_or_owner'
enable_snapshot_backup_status_attribute: enable_snapshot_backup_status_attribute:
key: 'volume_extension:snapshot_backup_status_attribute' key: 'volume_extension:snapshot_backup_status_attribute'
value: 'rule:admin_or_owner' value: 'rule:admin_or_owner'
# heat # heat
heat::use_syslog: true heat::use_syslog: true
@ -449,7 +449,7 @@ openstack::murano::params::tcp_listen_options: '[binary,
{exit_on_close,false}, {exit_on_close,false},
{keepalive,true}]' {keepalive,true}]'
openstack::murano::params::rabbit_tcp_listen_options: openstack::murano::params::rabbit_tcp_listen_options:
'[binary, '[binary,
{packet, raw}, {packet, raw},
{reuseaddr, true}, {reuseaddr, true},
{backlog, 128}, {backlog, 128},
@ -462,37 +462,37 @@ openstack::murano::params::rabbit_tcp_listen_options:
# is currently in either lighttpd or haproxy's cipher lists # is currently in either lighttpd or haproxy's cipher lists
# constructed on 2017-04-05 # constructed on 2017-04-05
openstack::murano::params::rabbit_cipher_list: ["AES128-GCM-SHA256", openstack::murano::params::rabbit_cipher_list: ["AES128-GCM-SHA256",
"AES128-SHA", "AES128-SHA",
"AES128-SHA256", "AES128-SHA256",
"AES256-GCM-SHA384", "AES256-GCM-SHA384",
"AES256-SHA", "AES256-SHA",
"AES256-SHA256", "AES256-SHA256",
"DHE-DSS-AES128-GCM-SHA256", "DHE-DSS-AES128-GCM-SHA256",
"DHE-DSS-AES128-SHA256", "DHE-DSS-AES128-SHA256",
"DHE-DSS-AES256-GCM-SHA384", "DHE-DSS-AES256-GCM-SHA384",
"DHE-DSS-AES256-SHA256", "DHE-DSS-AES256-SHA256",
"DHE-RSA-AES128-GCM-SHA256", "DHE-RSA-AES128-GCM-SHA256",
"DHE-RSA-AES128-SHA256", "DHE-RSA-AES128-SHA256",
"DHE-RSA-AES256-GCM-SHA384", "DHE-RSA-AES256-GCM-SHA384",
"DHE-RSA-AES256-SHA256", "DHE-RSA-AES256-SHA256",
"ECDH-ECDSA-AES128-GCM-SHA256", "ECDH-ECDSA-AES128-GCM-SHA256",
"ECDH-ECDSA-AES128-SHA256", "ECDH-ECDSA-AES128-SHA256",
"ECDH-ECDSA-AES256-GCM-SHA384", "ECDH-ECDSA-AES256-GCM-SHA384",
"ECDH-ECDSA-AES256-SHA384", "ECDH-ECDSA-AES256-SHA384",
"ECDHE-ECDSA-AES128-GCM-SHA256", "ECDHE-ECDSA-AES128-GCM-SHA256",
"ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA256",
"ECDHE-ECDSA-AES256-GCM-SHA384", "ECDHE-ECDSA-AES256-GCM-SHA384",
"ECDHE-ECDSA-AES256-SHA384", "ECDHE-ECDSA-AES256-SHA384",
"ECDHE-RSA-AES128-GCM-SHA256", "ECDHE-RSA-AES128-GCM-SHA256",
"ECDHE-RSA-AES128-SHA", "ECDHE-RSA-AES128-SHA",
"ECDHE-RSA-AES128-SHA256", "ECDHE-RSA-AES128-SHA256",
"ECDHE-RSA-AES256-GCM-SHA384", "ECDHE-RSA-AES256-GCM-SHA384",
"ECDHE-RSA-AES256-SHA", "ECDHE-RSA-AES256-SHA",
"ECDHE-RSA-AES256-SHA384", "ECDHE-RSA-AES256-SHA384",
"ECDH-RSA-AES128-GCM-SHA256", "ECDH-RSA-AES128-GCM-SHA256",
"ECDH-RSA-AES128-SHA256", "ECDH-RSA-AES128-SHA256",
"ECDH-RSA-AES256-GCM-SHA384", "ECDH-RSA-AES256-GCM-SHA384",
"ECDH-RSA-AES256-SHA384"] "ECDH-RSA-AES256-SHA384"]
# Magnum # Magnum
magnum::logging::use_syslog: true magnum::logging::use_syslog: true
@ -512,7 +512,7 @@ ironic::db::postgresql::encoding: 'UTF8'
ironic::logging::debug: false ironic::logging::debug: false
ironic::api::enabled: false ironic::api::enabled: false
ironic::conductor::enabled: false ironic::conductor::enabled: false
ironic::conductor::enabled_drivers: ['pxe_ipmitool','pxe_ipmitool_socat'] ironic::conductor::enabled_drivers: ['pxe_ipmitool', 'pxe_ipmitool_socat']
ironic::conductor::automated_clean: true ironic::conductor::automated_clean: true
ironic::conductor::default_boot_option: 'local' ironic::conductor::default_boot_option: 'local'
ironic::drivers::pxe::images_path: '/opt/img-conversions/ironic/images/' ironic::drivers::pxe::images_path: '/opt/img-conversions/ironic/images/'
@ -528,7 +528,7 @@ dcmanager::use_syslog: true
dcmanager::log_facility: 'local2' dcmanager::log_facility: 'local2'
dcmanager::debug: false dcmanager::debug: false
#FM # FM
fm::use_syslog: true fm::use_syslog: true
fm::log_facility: 'local2' fm::log_facility: 'local2'
fm::api::enable_proxy_headers_parsing: true fm::api::enable_proxy_headers_parsing: true
@ -536,4 +536,3 @@ fm::db::sync::user: 'root'
fm::database_idle_timeout: 60 fm::database_idle_timeout: 60
fm::database_max_overflow: 20 fm::database_max_overflow: 20
fm::database_max_pool_size: 1 fm::database_max_pool_size: 1

9
puppet-manifests/src/hieradata/global.yaml
View File

@ -42,14 +42,8 @@ neutron::vlan_transparent: true
neutron::pnet_audit_enabled: false neutron::pnet_audit_enabled: false
neutron::verbose: false neutron::verbose: false
neutron::root_helper: 'sudo'
neutron::log_dir: false neutron::log_dir: false
neutron::use_syslog: true 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::notification_driver: ['messagingv2']
neutron::dns_domain: 'openstacklocal' neutron::dns_domain: 'openstacklocal'
@ -59,7 +53,6 @@ nova::use_syslog: true
nova::debug: false nova::debug: false
nova::log_facility: 'local6' nova::log_facility: 'local6'
nova::notification_driver: 'messagingv2' nova::notification_driver: 'messagingv2'
nova::notify_on_state_change: 'vm_and_task_state'
nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL' nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
nova::notify_on_state_change: 'vm_and_task_state' nova::notify_on_state_change: 'vm_and_task_state'
@ -104,7 +97,7 @@ platform::collectd::params::collectd_d_dir: '/etc/collectd.d'
# collectd: module named plugins # collectd: module named plugins
platform::collectd::params::module_path: '/opt/collectd/extensions/python' platform::collectd::params::module_path: '/opt/collectd/extensions/python'
platform::collectd::params::plugins: ['fm_notifier','mtce_notifier'] platform::collectd::params::plugins: ['fm_notifier', 'mtce_notifier']
platform::collectd::params::mtce_notifier_port: 2101 platform::collectd::params::mtce_notifier_port: 2101
platform::collectd::params::log_traces: true platform::collectd::params::log_traces: true
platform::collectd::params::encoding: "utf-8" platform::collectd::params::encoding: "utf-8"

1042
sysinv/sysinv/sysinv/sysinv/tests/events_for_testing.yaml
View File

File diff suppressed because it is too large Load Diff

10
tox.ini
View File

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