Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Puppet4 is much stricter about arrays and strings, make all strings #7

Merged
merged 1 commit into from
Jan 14, 2016
Merged

Puppet4 is much stricter about arrays and strings, make all strings #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions manifests/cli/plugin.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$module,
$repo=None,
$version='present',
$install_args=[],
$install_args,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be a required parameter. Probably should be an undef.

$base_config={}
) {

Expand All @@ -15,14 +15,13 @@
$user = $herqles::user

if !defined(Python::Pip[$pkgname]) {
$_install_args_string = join($install_args, ' ')
python::pip { $pkgname:
ensure => $version,
pkgname => $pkgname,
url => $repo,
virtualenv => "${install_path}/venv",
owner => $user,
install_args => $_install_args_string,
install_args => $install_args,
}
}

Expand Down
10 changes: 3 additions & 7 deletions manifests/component.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$config,
$repo=None,
$version='present',
$install_args=[]
$install_args,
) {

require ::herqles
Expand All @@ -17,7 +17,6 @@
if $repo != None {
validate_string($repo)
}
validate_array($install_args)
validate_hash($config)

python::pip { $pkgname:
Expand Down Expand Up @@ -53,11 +52,8 @@

if $manage_service {
herqles::service { $name:
subscribe => [ File["${config_path}/${name}/config.yml"], File['/etc/sysconfig/herqles'] ],
require => [
File["${config_path}/${name}/config.yml"],
File['/etc/sysconfig/herqles']
]
subscribe => File["${config_path}/${name}/config.yml", '/etc/sysconfig/herqles' ],
require => File["${config_path}/${name}/config.yml", '/etc/sysconfig/herqles'],
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/framework.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
herqles::component { 'hq-framework':
pkgname => 'hq-framework',
repo => 'git+https://github.com/herqles-io/hq-framework.git',
install_args => [ '--process-dependency-links' ],
install_args => '--process-dependency-links',
version => $version,
config => $config,
}
Expand Down
3 changes: 1 addition & 2 deletions manifests/framework/framework_data.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$pkgname,
$version='present',
$repo=undef,
$install_args=[]
$install_args,
) {

validate_string($module)
Expand All @@ -12,6 +12,5 @@
if $repo != undef {
validate_string($repo)
}
validate_array($install_args)

}
2 changes: 1 addition & 1 deletion manifests/manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
herqles::component { 'hq-manager':
pkgname => 'hq-manager',
repo => 'git+https://github.com/herqles-io/hq-manager.git',
install_args => [ '--process-dependency-links' ],
install_args => '--process-dependency-links',
version => $version,
config => $config
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/worker.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
herqles::component { 'hq-worker':
pkgname => 'hq-worker',
repo => 'git+https://github.com/herqles-io/hq-worker.git',
install_args => [ '--process-dependency-links' ],
install_args => '--process-dependency-links',
version => $version,
config => $config
}
Expand Down
3 changes: 1 addition & 2 deletions manifests/worker/worker_data.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$pkgname,
$version='present',
$repo=undef,
$install_args=[]
$install_args,
) {

validate_string($module)
Expand All @@ -12,6 +12,5 @@
if $repo != undef {
validate_string($repo)
}
validate_array($install_args)

}