Add Gemfile and puppet 4 checks
In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. Also fix errors caught by the puppet-lint-absolute_classname-check gem and arrow alignment errors now caught by the bundle-installed puppet-lint. Avoid trying to catch empty_string errors for now. Change-Id: Ie881a8ac7539fbcbc283c3a572efe2e7562ac426
This commit is contained in:
parent
b697601a4b
commit
abdf9b79ce
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
Gemfile.lock
|
||||
.bundled_gems/
|
31
Gemfile
Normal file
31
Gemfile
Normal file
@ -0,0 +1,31 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'puppetlabs_spec_helper', :require => false
|
||||
|
||||
gem 'metadata-json-lint'
|
||||
# This is nice and all, but let's not worry about it until we've actually
|
||||
# got puppet 4.x sorted
|
||||
# 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'
|
||||
# This module makes heavy use of empty string defaults, skip this check for now
|
||||
#gem 'puppet-lint-empty_string-check'
|
||||
gem 'puppet-lint-leading_zero-check'
|
||||
gem 'puppet-lint-variable_contains_upcase'
|
||||
gem 'puppet-lint-spaceship_operator_without_tag-check'
|
||||
gem 'puppet-lint-undef_in_function-check'
|
||||
|
||||
if puppetversion = ENV['PUPPET_GEM_VERSION']
|
||||
gem 'puppet', puppetversion, :require => false
|
||||
else
|
||||
gem 'puppet', '~> 3.0', :require => false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
# vim:ft=ruby
|
@ -42,12 +42,12 @@ class zanata::apache (
|
||||
}
|
||||
|
||||
::httpd::vhost { $vhost_name:
|
||||
port => 443,
|
||||
docroot => 'MEANINGLESS ARGUMENT',
|
||||
priority => '50',
|
||||
template => 'zanata/zanata.vhost.erb',
|
||||
ssl => true,
|
||||
subscribe => File['/opt/wildfly/standalone/configuration/standalone.xml'],
|
||||
port => 443,
|
||||
docroot => 'MEANINGLESS ARGUMENT',
|
||||
priority => '50',
|
||||
template => 'zanata/zanata.vhost.erb',
|
||||
ssl => true,
|
||||
subscribe => File['/opt/wildfly/standalone/configuration/standalone.xml'],
|
||||
}
|
||||
|
||||
if $ssl_cert_file_contents != '' {
|
||||
|
@ -67,11 +67,11 @@ class zanata::client(
|
||||
}
|
||||
|
||||
java_ks { 'zanata_server:keystore':
|
||||
ensure => latest,
|
||||
certificate => "/opt/zanata/${server_id}.crt",
|
||||
target => '/etc/ssl/certs/java/cacerts',
|
||||
password => 'changeit',
|
||||
require => File["/opt/zanata/${server_id}.crt"],
|
||||
ensure => latest,
|
||||
certificate => "/opt/zanata/${server_id}.crt",
|
||||
target => '/etc/ssl/certs/java/cacerts',
|
||||
password => 'changeit',
|
||||
require => File["/opt/zanata/${server_id}.crt"],
|
||||
}
|
||||
|
||||
file { '/etc/ssl/certs/java/cacerts':
|
||||
|
@ -54,7 +54,7 @@ class zanata(
|
||||
zanata::validate_listener { $zanata_listeners:
|
||||
}
|
||||
|
||||
class { 'zanata::wildfly':
|
||||
class { '::zanata::wildfly':
|
||||
wildfly_version => $zanata_wildfly_version,
|
||||
wildfly_install_source => $zanata_wildfly_install_url,
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ class zanata::mysql(
|
||||
|
||||
) {
|
||||
|
||||
class { 'mysql::server':
|
||||
class { '::mysql::server':
|
||||
config_hash => {
|
||||
'root_password' => $mysql_root_password,
|
||||
'default_engine' => 'InnoDB',
|
||||
@ -34,7 +34,7 @@ class zanata::mysql(
|
||||
}
|
||||
}
|
||||
|
||||
include mysql::server::account_security
|
||||
include ::mysql::server::account_security
|
||||
|
||||
mysql::db { $db_name:
|
||||
user => $db_username,
|
||||
|
Loading…
Reference in New Issue
Block a user