Fix puppet-lint before upgrading gem
Removing puppet-lint warnings in favor of upgrading to latest gem 2016-09-13 21:08:47.767844 | manifests/api.pp:558:WARNING: line has more than 140 characters 2016-09-13 21:08:47.767929 | manifests/params.pp:35:WARNING: line has more than 140 characters 2016-09-13 21:08:47.767948 | tests/site.pp:6:WARNING: unquoted node name found Change-Id: I3a8a01057befa358867eb0396e19c9b763e2b13a
This commit is contained in:
parent
ffa154c77a
commit
3963d27ef4
@ -555,7 +555,9 @@ class glance::api(
|
|||||||
$auth_uri_real = pick($auth_uri, $::glance::api::authtoken::auth_uri)
|
$auth_uri_real = pick($auth_uri, $::glance::api::authtoken::auth_uri)
|
||||||
$defaults = {
|
$defaults = {
|
||||||
'glance-api' => {
|
'glance-api' => {
|
||||||
|
# lint:ignore:140chars
|
||||||
'command' => "glance --os-auth-url ${auth_uri_real} --os-project-name ${keystone_tenant_real} --os-username ${keystone_username_real} --os-password ${keystone_password_real} image-list",
|
'command' => "glance --os-auth-url ${auth_uri_real} --os-project-name ${keystone_tenant_real} --os-username ${keystone_username_real} --os-password ${keystone_password_real} image-list",
|
||||||
|
# lint:endignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$validation_options_hash = merge ($defaults, $validation_options)
|
$validation_options_hash = merge ($defaults, $validation_options)
|
||||||
|
@ -32,7 +32,8 @@ class glance::params {
|
|||||||
$pyceph_package_name = 'python-ceph'
|
$pyceph_package_name = 'python-ceph'
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
|
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
|
||||||
|
module ${module_name} only support osfamily RedHat and Debian")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
|
|
||||||
# uses the keystone packages
|
# uses the keystone packages
|
||||||
# to ensure that we use the latest precise packages
|
# to ensure that we use the latest precise packages
|
||||||
Exec { logoutput => 'on_failure' }
|
Exec { logoutput => 'on_failure' }
|
||||||
|
|
||||||
node glance_keystone_mysql {
|
node 'glance_keystone_mysql' {
|
||||||
class { '::mysql::server': }
|
class { '::mysql::server': }
|
||||||
class { '::keystone':
|
class { '::keystone':
|
||||||
debug => true,
|
debug => true,
|
||||||
|
Loading…
Reference in New Issue
Block a user