diff options
| author | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-07-07 16:02:47 +0000 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2017-07-21 01:14:07 +0800 |
| commit | 40e796bd693a8bc6243ee39a6540357e1d559ea8 (patch) | |
| tree | 236a759b203006439b00cdad2ac8d50cdd04e226 | |
| parent | 4eca9b1ae59264e5b83080ec5d2d2b1b9f0b5c8d (diff) | |
BIGTOP-2835: puppet fails when bigtop::jdk_preinstalled is true
Many modules require Package["jdk"]. Ensure it is available regardless
of the bigtop::jdk_preinstalled option. Modify the jdk class so the
package resources perform a no-op if bigtop::jdk_preinstalled is true.
Signed-off-by: Evans Ye <evansye@apache.org>
| -rw-r--r-- | bigtop-deploy/puppet/manifests/jdk.pp | 10 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/manifests/site.pp | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/bigtop-deploy/puppet/manifests/jdk.pp b/bigtop-deploy/puppet/manifests/jdk.pp index 152e8a41..fc2eb4e7 100644 --- a/bigtop-deploy/puppet/manifests/jdk.pp +++ b/bigtop-deploy/puppet/manifests/jdk.pp @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +$jdk_preinstalled = hiera("bigtop::jdk_preinstalled", false) + class jdk { case $::operatingsystem { /Debian/: { @@ -39,6 +41,7 @@ class jdk { package { 'jdk': name => 'openjdk-8-jdk', ensure => present, + noop => $jdk_preinstalled, } } @@ -48,12 +51,14 @@ class jdk { package { 'jdk': name => 'openjdk-8-jdk', ensure => present, + noop => $jdk_preinstalled, } } /(CentOS|Amazon|Fedora)/: { package { 'jdk': name => 'java-1.8.0-openjdk-devel', - ensure => present + ensure => present, + noop => $jdk_preinstalled, } if ($::operatingsystem == "Fedora") { file { '/usr/lib/jvm/java-1.8.0-openjdk/jre/lib/security/cacerts': @@ -65,7 +70,8 @@ class jdk { /OpenSuSE/: { package { 'jdk': name => 'java-1_8_0-openjdk-devel', - ensure => present + ensure => present, + noop => $jdk_preinstalled, } } } diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index cd6e8d5a..4763db65 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -13,11 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -$jdk_preinstalled = hiera("bigtop::jdk_preinstalled", false) -if ( ! $jdk_preinstalled ) { - require jdk - Class['jdk'] -> Service<||> -} +require jdk +Class['jdk'] -> Service<||> $provision_repo = hiera("bigtop::provision_repo", true) if ($provision_repo) { |