openstack/puppet-ironic
Code Issues Proposed changes

Fix puppet-lint before upgrading gem

Browse Source 
Removing puppet-lint warnings in favor of
upgrading the puppet-lint gem

2016-09-13 21:05:00.043653 | examples/ironic.pp:55:WARNING: unquoted node name found
2016-09-13 21:05:00.043728 | examples/ironic.pp:84:WARNING: unquoted node name found
2016-09-13 21:05:00.043749 | manifests/api.pp:120:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043767 | manifests/api.pp:124:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043785 | manifests/api.pp:128:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043803 | manifests/api.pp:132:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043822 | manifests/api.pp:136:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043840 | manifests/api.pp:140:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043858 | manifests/api.pp:196:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043877 | manifests/inspector.pp:233:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043910 | manifests/inspector.pp:237:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043929 | manifests/inspector.pp:241:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043947 | manifests/inspector.pp:245:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043965 | manifests/inspector.pp:249:WARNING: line has more than 140 characters
2016-09-13 21:05:00.043984 | manifests/inspector.pp:325:WARNING: line has more than 140 characters

Change-Id: I2fd5466639b5fd8eb709b8f2f55984c073a0c99d
This commit is contained in:
Carlos Camacho 2016-09-14 11:24:51 +02:00
parent 66817defef
commit 88656e9d44
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ironic.pp
View File

@ -78,7 +78,7 @@ node 'db' {
}
node controller {
node 'controller' {
class { '::ironic':
db_password => $db_password,
@ -107,7 +107,7 @@ node controller {
}
node bifrost-controller {
node 'bifrost-controller' {
class { '::ironic::bifrost':
network_interface => 'eth1',

21
manifests/api.pp
View File

@ -117,27 +117,33 @@ class ironic::api (
include ::ironic::policy
if $admin_tenant_name {
warning('Parameter "ironic::api::admin_tenant_name" is deprecated and will be removed in O release. Use "ironic::api::authtoken::project_name" parameter instead.')
warning('Parameter "ironic::api::admin_tenant_name" is deprecated and will be removed in O release. \
Use "ironic::api::authtoken::project_name" parameter instead.')
}
if $admin_user {
warning('Parameter "ironic::api::admin_user" is deprecated will be removed in O release. Use "ironic::api::authtoken::username" parameter instead.')
warning('Parameter "ironic::api::admin_user" is deprecated will be removed in O release. \
Use "ironic::api::authtoken::username" parameter instead.')
}
if $admin_password {
warning('Parameter "ironic::api::admin_password" is deprecated and will be removed in O release. Use "ironic::api::authtoken::password" parameter instead.')
warning('Parameter "ironic::api::admin_password" is deprecated and will be removed in O release. \
Use "ironic::api::authtoken::password" parameter instead.')
}
if $identity_uri {
warning('Parameter "ironic::api::identity_uri" is deprecated and will be removed in O release. Use "ironic::api::authtoken::auth_url" parameter instead.')
warning('Parameter "ironic::api::identity_uri" is deprecated and will be removed in O release. \
Use "ironic::api::authtoken::auth_url" parameter instead.')
}
if $auth_uri {
warning('Parameter "ironic::api::auth_uri" is deprecated and will be removed in O release. Use "ironic::api::authtoken::auth_uri" parameter instead.')
warning('Parameter "ironic::api::auth_uri" is deprecated and will be removed in O release. \
Use "ironic::api::authtoken::auth_uri" parameter instead.')
}
if $memcached_servers {
warning('Parameter "ironic::api::memcached_servers" is deprecated and will be removed in O release. Use "ironic::api::authtoken::memcached_servers" parameter instead.')
warning('Parameter "ironic::api::memcached_servers" is deprecated and will be removed in O release. \
Use "ironic::api::authtoken::memcached_servers" parameter instead.')
}
include ::ironic::api::authtoken
@ -193,7 +199,8 @@ class ironic::api (
# we need to make sure ironic-api/eventlet is stopped before trying to start apache
Service['ironic-api'] -> Service[$service_name]
} else {
fail('Invalid service_name. Either ironic-api/openstack-ironic-api for running as a standalone service, or httpd for being run by a httpd server')
fail('Invalid service_name. Either ironic-api/openstack-ironic-api for running as a \
standalone service, or httpd for being run by a httpd server')
}
}

25
manifests/inspector.pp
View File

@ -230,30 +230,36 @@ class ironic::inspector (
include ::ironic::inspector::logging
if $admin_tenant_name {
warning('Parameter "ironic::inspector::admin_tenant_name" is deprecated and will be removed in O release. Use "ironic::inspector::authtoken::project_name" parameter instead.')
warning('Parameter "ironic::inspector::admin_tenant_name" is deprecated and will be removed in O release. \
Use "ironic::inspector::authtoken::project_name" parameter instead.')
}
if $admin_user {
warning('Parameter "ironic::inspector::admin_user" is deprecated will be removed in O release. Use "ironic::inspector::authtoken::username" parameter instead.')
warning('Parameter "ironic::inspector::admin_user" is deprecated will be removed in O release. \
Use "ironic::inspector::authtoken::username" parameter instead.')
}
if $admin_password {
warning('Parameter "ironic::inspector::admin_password" is deprecated and will be removed in O release. Use "ironic::inspector::authtoken::password" parameter instead.')
warning('Parameter "ironic::inspector::admin_password" is deprecated and will be removed in O release. \
Use "ironic::inspector::authtoken::password" parameter instead.')
}
if $identity_uri {
warning('Parameter "ironic::inspector::identity_uri" is deprecated and will be removed in O release. Use "ironic::inspector::authtoken::auth_url" parameter instead.')
warning('Parameter "ironic::inspector::identity_uri" is deprecated and will be removed in O release. \
Use "ironic::inspector::authtoken::auth_url" parameter instead.')
}
if $auth_uri {
warning('Parameter "ironic::inspector::auth_uri" is deprecated and will be removed in O release. Use "ironic::inspector::authtoken::auth_uri" parameter instead.')
warning('Parameter "ironic::inspector::auth_uri" is deprecated and will be removed in O release. \
Use "ironic::inspector::authtoken::auth_uri" parameter instead.')
}
if $auth_strategy == 'keystone' {
include ::ironic::inspector::authtoken
}
warning("After Newton cycle ::ironic::inspector won't provide tftpboot and httpboot setup, please include ::ironic::pxe")
warning("After Newton cycle ::ironic::inspector won't provide \
tftpboot and httpboot setup, please include ::ironic::pxe")
include ::ironic::pxe
$tftp_root_real = pick($::ironic::pxe::common::tftp_root, $tftp_root)
@ -299,6 +305,11 @@ class ironic::inspector (
# Configure inspector.conf
#Processing hooks string
#Moved here in favor of removing the
#140 chars exeeded error in puppet-lint
$p_hooks = join(delete_undef_values(['$default_processing_hooks', $additional_processing_hooks]), ',')
ironic_inspector_config {
'DEFAULT/listen_address': value => $listen_address;
'DEFAULT/auth_strategy': value => $auth_strategy;
@ -322,7 +333,7 @@ class ironic::inspector (
'swift/auth_url': value => $swift_auth_url;
# Here we use oslo.config interpolation with another option default_processing_hooks,
# which we don't change as it might break introspection completely.
'processing/processing_hooks': value => join(delete_undef_values(['$default_processing_hooks', $additional_processing_hooks]), ',');
'processing/processing_hooks': value => $p_hooks;
}
# Install package