Skip to content

Commit

Permalink
Remove use of functions from puppet-common in favor of stdlib.
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed Apr 15, 2015
1 parent cec063a commit 6e8b4cb
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
1 change: 0 additions & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ fixtures:
repositories:
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
foreman: "git://github.com/theforeman/puppet-foreman.git"
common: "git://github.com/katello/puppet-common.git"
symlinks:
certs: "#{source_dir}"
4 changes: 2 additions & 2 deletions manifests/capsule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

# until we support again pushing the cert rpms to the Katello,
# make sure the certs_tar path is present
validate_present($certs_tar)
validate_present($capsule_fqdn)
validate_absolute_path($certs_tar)
validate_string($capsule_fqdn)

class { 'certs::puppet': hostname => $capsule_fqdn }
class { 'certs::foreman': hostname => $capsule_fqdn }
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
) inherits certs::params {

if $server_cert {
validate_file_exists($server_cert, $server_cert_req, $server_key, $server_ca_cert)
validate_absolute_path([$server_cert, $server_cert_req, $server_key, $server_ca_cert])
}

$nss_db_dir = "${pki_dir}/nssdb"
Expand Down
4 changes: 0 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
{
"name": "theforeman-foreman",
"version_requirement": ">= 2.0.0"
},
{
"name": "katello-common",
"version_requirement": ">= 0.0.1"
}
]
}

0 comments on commit 6e8b4cb

Please sign in to comment.