Add Puppet 4.x lint checks
This changes the puppet-lint requirement to 1.1.x, so that we can use puppet-lint plugins. Most of these plugins are for 4.x compat, but some just catch common errors. Change-Id: I34c2eedd78868687613c7f89ce9aef92197f6c69
This commit is contained in:
parent
53d51d8f35
commit
feee104f7f
9
Gemfile
9
Gemfile
@ -6,6 +6,15 @@ group :development, :test do
|
||||
|
||||
gem 'metadata-json-lint'
|
||||
gem 'puppet-lint-param-docs'
|
||||
gem 'puppet-lint-absolute_classname-check'
|
||||
gem 'puppet-lint-absolute_template_path'
|
||||
gem 'puppet-lint-trailing_newline-check'
|
||||
|
||||
# Puppet 4.x related lint checks
|
||||
gem 'puppet-lint-unquoted_string-check'
|
||||
gem 'puppet-lint-leading_zero-check'
|
||||
gem 'puppet-lint-variable_contains_upcase'
|
||||
gem 'puppet-lint-numericvariable'
|
||||
|
||||
gem 'json'
|
||||
gem 'webmock'
|
||||
|
@ -1,8 +1,8 @@
|
||||
# This is an example of site.pp to deploy Trove
|
||||
|
||||
class { 'trove::client': }
|
||||
class { '::trove::client': }
|
||||
|
||||
class { 'trove::keystone::auth':
|
||||
class { '::trove::keystone::auth':
|
||||
admin_address => '10.0.0.1',
|
||||
internal_address => '10.0.0.1',
|
||||
public_address => '10.0.0.1',
|
||||
@ -10,29 +10,29 @@ class { 'trove::keystone::auth':
|
||||
region => 'OpenStack'
|
||||
}
|
||||
|
||||
class { 'trove::db::mysql':
|
||||
class { '::trove::db::mysql':
|
||||
password => 'dbpass',
|
||||
host => '10.0.0.1',
|
||||
allowed_hosts => '10.0.0.1'
|
||||
}
|
||||
|
||||
class { 'trove':
|
||||
class { '::trove':
|
||||
database_connection => 'mysql://trove:secrete@10.0.0.1/trove?charset=utf8',
|
||||
rabbit_hosts => '10.0.0.1',
|
||||
rabbit_password => 'secrete',
|
||||
nova_proxy_admin_pass => 'novapass',
|
||||
}
|
||||
|
||||
class { 'trove::api':
|
||||
class { '::trove::api':
|
||||
bind_host => '10.0.0.1',
|
||||
auth_url => 'https://identity.openstack.org:5000/v2.0',
|
||||
keystone_password => 'verysecrete'
|
||||
}
|
||||
|
||||
class { 'trove::conductor':
|
||||
class { '::trove::conductor':
|
||||
auth_url => 'https://identity.openstack.org:5000/v2.0'
|
||||
}
|
||||
|
||||
class { 'trove::taskmanager':
|
||||
class { '::trove::taskmanager':
|
||||
auth_url => 'https://identity.openstack.org:5000/v2.0'
|
||||
}
|
||||
|
@ -146,8 +146,8 @@ class trove::api(
|
||||
$ensure_package = 'present',
|
||||
) inherits trove {
|
||||
|
||||
require keystone::python
|
||||
include trove::params
|
||||
require ::keystone::python
|
||||
include ::trove::params
|
||||
|
||||
Trove_config<||> ~> Exec['post-trove_config']
|
||||
Trove_config<||> ~> Service['trove-api']
|
||||
|
@ -30,7 +30,7 @@ class trove::client (
|
||||
$package_ensure = present
|
||||
) {
|
||||
|
||||
include trove::params
|
||||
include ::trove::params
|
||||
|
||||
package { 'python-troveclient':
|
||||
ensure => $package_ensure,
|
||||
|
@ -64,7 +64,7 @@ class trove::conductor(
|
||||
$conductor_manager = 'trove.conductor.manager.Manager',
|
||||
) inherits trove {
|
||||
|
||||
include trove::params
|
||||
include ::trove::params
|
||||
|
||||
Package[$::trove::params::conductor_package_name] -> Trove_conductor_config<||>
|
||||
Trove_conductor_config<||> ~> Exec['post-trove_config']
|
||||
|
@ -35,8 +35,8 @@ define trove::generic_service(
|
||||
$ensure_package = 'present'
|
||||
) {
|
||||
|
||||
include trove::params
|
||||
include trove::db::sync
|
||||
include ::trove::params
|
||||
include ::trove::db::sync
|
||||
|
||||
$trove_title = "trove-${name}"
|
||||
Exec['post-trove_config'] ~> Service<| title == $trove_title |>
|
||||
|
@ -69,7 +69,7 @@ class trove::guestagent(
|
||||
$control_exchange = 'trove'
|
||||
) inherits trove {
|
||||
|
||||
include trove::params
|
||||
include ::trove::params
|
||||
|
||||
Package[$::trove::params::guestagent_package_name] -> Trove_guestagent_config<||>
|
||||
Trove_guestagent_config<||> ~> Exec['post-trove_config']
|
||||
|
@ -184,7 +184,7 @@ class trove(
|
||||
# DEPRECATED PARAMETERS
|
||||
$mysql_module = undef,
|
||||
) {
|
||||
include trove::params
|
||||
include ::trove::params
|
||||
|
||||
if $mysql_module {
|
||||
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
|
||||
|
@ -86,7 +86,7 @@ class trove::taskmanager(
|
||||
$guestagent_config_file = '/etc/trove/trove-guestmanager.conf'
|
||||
) inherits trove {
|
||||
|
||||
include trove::params
|
||||
include ::trove::params
|
||||
|
||||
Package[$::trove::params::taskmanager_package_name] -> Trove_taskmanager_config<||>
|
||||
Trove_taskmanager_config<||> ~> Exec['post-trove_config']
|
||||
|
Loading…
Reference in New Issue
Block a user