Remove precise references
Remove the sources.list From review.pp, don't set java_home. The puppet-gerrit module figures it out automatically. For review-dev.pp, it seems java paths are used to import keys for storyboard. Add matching logic for that. Remove precise only workaround in status.o.o [1] https://git.openstack.org/cgit/openstack-infra/puppet-gerrit/tree/manifests/init.pp#n274 Change-Id: I31c9196a32febf4760b897a3110150fcd581e173
This commit is contained in:
parent
e3043006a0
commit
e0e08a3613
@ -1,13 +0,0 @@
|
|||||||
# This file is kept updated by puppet, adapted from
|
|
||||||
# https://help.ubuntu.com/12.04/sample/sources.list
|
|
||||||
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise main restricted
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise-updates main restricted
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise universe
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise-updates universe
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise multiverse
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise-updates multiverse
|
|
||||||
deb http://us.archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse
|
|
||||||
deb http://security.ubuntu.com/ubuntu precise-security main restricted
|
|
||||||
deb http://security.ubuntu.com/ubuntu precise-security universe
|
|
||||||
deb http://security.ubuntu.com/ubuntu precise-security multiverse
|
|
@ -82,18 +82,12 @@ class openstack_project::review (
|
|||||||
$projects_config = 'openstack_project/review.projects.ini.erb',
|
$projects_config = 'openstack_project/review.projects.ini.erb',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
$java_home = $::lsbdistcodename ? {
|
|
||||||
'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
|
|
||||||
'trusty' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
|
|
||||||
}
|
|
||||||
|
|
||||||
class { 'project_config':
|
class { 'project_config':
|
||||||
url => $project_config_repo,
|
url => $project_config_repo,
|
||||||
}
|
}
|
||||||
|
|
||||||
$accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
|
$accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
|
||||||
class { 'openstack_project::gerrit':
|
class { 'openstack_project::gerrit':
|
||||||
java_home => $java_home,
|
|
||||||
git_http_url => 'https://git.openstack.org/',
|
git_http_url => 'https://git.openstack.org/',
|
||||||
canonical_git_url => 'git://git.openstack.org/',
|
canonical_git_url => 'git://git.openstack.org/',
|
||||||
ssl_cert_file => $ssl_cert_file,
|
ssl_cert_file => $ssl_cert_file,
|
||||||
|
@ -28,9 +28,18 @@ class openstack_project::review_dev (
|
|||||||
$projects_config = 'openstack_project/review-dev.projects.ini.erb',
|
$projects_config = 'openstack_project/review-dev.projects.ini.erb',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
$java_home = $::lsbdistcodename ? {
|
case $::lsbdistcodename {
|
||||||
'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
|
'trusty': {
|
||||||
'trusty' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
|
$jre_package = 'openjdk-7-jre-headless'
|
||||||
|
$java_home = '/usr/lib/jvm/java-7-openjdk-amd64/jre'
|
||||||
|
}
|
||||||
|
'xenial': {
|
||||||
|
$jre_package = 'openjdk-8-jre-headless'
|
||||||
|
$java_home = '/usr/lib/jvm/java-8-openjdk-amd64/jre'
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
fail("Operating system release ${::lsbdistcodename} not supported.")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
realize (
|
realize (
|
||||||
@ -202,7 +211,7 @@ class openstack_project::review_dev (
|
|||||||
unless => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts >/dev/null 2>&1",
|
unless => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts >/dev/null 2>&1",
|
||||||
path => '/bin:/usr/bin',
|
path => '/bin:/usr/bin',
|
||||||
require => [
|
require => [
|
||||||
Package['openjdk-7-jre-headless'],
|
Package[$jre_package],
|
||||||
File['/home/gerrit2/storyboard-dev.crt'],
|
File['/home/gerrit2/storyboard-dev.crt'],
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
@ -26,14 +26,6 @@ class openstack_project::status (
|
|||||||
|
|
||||||
include ::httpd
|
include ::httpd
|
||||||
|
|
||||||
# The Apache mod_version module only needs to be enabled on Ubuntu 12.04
|
|
||||||
# as it comes compiled and enabled by default on newer OS, including CentOS
|
|
||||||
if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
|
|
||||||
httpd::mod { 'version':
|
|
||||||
ensure => present
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! defined(Httpd::Mod['rewrite']) {
|
if ! defined(Httpd::Mod['rewrite']) {
|
||||||
httpd::mod { 'rewrite':
|
httpd::mod { 'rewrite':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user