opendev/puppet-zanata
Code Issues Proposed changes

Upgrade wildfly puppet module

Browse Source 
We are currently on version 0.1.7 of the Wildfly puppet module. The
latest tagged release is 0.2.1. Since we aren't using wildfly
elsewhere at the moment, upgrade the module. (See related commit
Ia144b9c716a82e8152a7962124f4184cdfe7dccd) The new wildfly puppet
module has removed the "--no-check-certificate" flag, so we need to
change the download location for wildfly so we can continue to use
https (the previous URL had certificate issues).

Also fix a dependency issue that didn't get caught until I tested
this change more.

Change-Id: I9f38b9425696ba9f955f9719f64992314316e83e
This commit is contained in:
stephane 2015-04-08 12:40:33 -07:00
parent a30bc61be3
commit f57f609f84
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/init.pp
View File

@ -23,7 +23,7 @@ class zanata(
$zanata_db_password, $zanata_db_password,
$zanata_wildfly_version = '8.1.0', $zanata_wildfly_version = '8.1.0',
$zanata_wildfly_install_url = 'https://download.jboss.org/wildfly/8.1.0.Final/wildfly-8.1.0.Final.tar.gz', $zanata_wildfly_install_url = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/8.1.0.Final/wildfly-dist-8.1.0.Final.tar.gz',
$zanata_hibernate_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip', $zanata_hibernate_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip',
$zanata_mojarra_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip', $zanata_mojarra_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip',
@ -131,6 +131,7 @@ class zanata(
target => '/usr/share/java/mysql-connector-java.jar', target => '/usr/share/java/mysql-connector-java.jar',
require => [ require => [
Package['libmysql-java'], Package['libmysql-java'],
Class['zanata::wildfly'],
], ],
} }

8
manifests/wildfly.pp
View File

@ -16,20 +16,16 @@
# #
class zanata::wildfly( class zanata::wildfly(
$wildfly_version = '8.1.0', $wildfly_version = '8.1.0',
$wildfly_install_source = 'https://download.jboss.org/wildfly/8.1.0.Final/wildfly-8.1.0.Final.tar.gz', $wildfly_install_source = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/8.1.0.Final/wildfly-dist-8.1.0.Final.tar.gz',
) { ) {
include wildfly
package { 'openjdk-7-jre-headless': package { 'openjdk-7-jre-headless':
ensure => present, ensure => present,
} }
$wildfly_install_file = inline_template('<%= File.basename(@wildfly_install_source) %>') class { '::wildfly':
class { 'wildfly::install':
version => $wildfly_version, version => $wildfly_version,
install_source => $wildfly_install_source, install_source => $wildfly_install_source,
install_file => $wildfly_install_file,
config => 'standalone.xml', config => 'standalone.xml',
java_home => '/usr/lib/jvm/java-7-openjdk-amd64/jre/', java_home => '/usr/lib/jvm/java-7-openjdk-amd64/jre/',
require => Package['openjdk-7-jre-headless'], require => Package['openjdk-7-jre-headless'],