diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html index ccb4382..4a3f9b4 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html @@ -124,8 +124,8 @@ class confdroid_jenkins::main::install ( require confdroid_java require confdroid_jenkins::main::yumrepo - package { $reqpackages: - ensure => $pkg_ensure, + package { $js_reqpackages: + ensure => $js_pkg_ensure, } } } diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html index cdcaf33..e1336db 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html @@ -112,7 +112,7 @@
whether to enable GPG check for the Jenkins repository
+-19 20 21 22 @@ -406,15 +410,16 @@ 54 55 56 -57+57 +58
# File 'manifests/params.pp', line 19
+ # File 'manifests/params.pp', line 20
class confdroid_jenkins::params (
- Array $reqpackages = ['jenkins','fontconfig'],
- String $pkg_ensure = 'latest',
+ Array $js_reqpackages = ['jenkins','fontconfig'],
+ String $js_pkg_ensure = 'present',
String $js_gpg_check = '1',
String $js_repo_enabled = '1',
String $js_gpg_repo_check = '1',
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index 03aa268..4ff767f 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -10,8 +10,8 @@ class confdroid_jenkins::main::install (
require confdroid_java
require confdroid_jenkins::main::yumrepo
- package { $reqpackages:
- ensure => $pkg_ensure,
+ package { $js_reqpackages:
+ ensure => $js_pkg_ensure,
}
}
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 6f24e90..e4b747a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,14 +2,15 @@
# Module name: confdroid_jenkins
# Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class holds all parameters for the confdroid_jenkins module.
-# @param [Array] reqpackages which packages to install
-# @param [String] pkg_ensure which packages to install
+# @param [Array] js_reqpackages which packages to install
+# @param [String] js_pkg_ensure which packages to install
# @param [String] js_gpg_check whether to enable GPG check for Jenkins packages
# @param [String] js_repo_enabled whether to enable the Jenkins repository
# @param [String] js_host_fqdn fqdn of the host where Jenkins should run
# @param [String] js_base_url the base URL for the Jenkins repository
# @param [String] js_key the filename of the Jenkins GPG key to import
# @param [String] js_key_code the code of the Jenkins GPG key to check
+# @param [String] js_gpg_repo_check whether to enable GPG check for the Jenkins repository
# @param [Boolean] js_enable_fw whether to enable firewall control
# @param [String] js_fw_rule the prefix for the firewall rule order
# @param [String] js_jenkins_port the port to open for Jenkins
@@ -18,8 +19,8 @@
##############################################################################
class confdroid_jenkins::params (
- Array $reqpackages = ['jenkins','fontconfig'],
- String $pkg_ensure = 'latest',
+ Array $js_reqpackages = ['jenkins','fontconfig'],
+ String $js_pkg_ensure = 'present',
String $js_gpg_check = '1',
String $js_repo_enabled = '1',
String $js_gpg_repo_check = '1',