Browse Source

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
changes/57/545157/1
Ian Wienand 1 year ago
parent
commit
e0e08a3613

+ 0
- 13
modules/openstack_project/files/sources.list.precise.amd64 View File

@@ -1,13 +0,0 @@
1
-# This file is kept updated by puppet, adapted from
2
-# https://help.ubuntu.com/12.04/sample/sources.list
3
-
4
-deb http://us.archive.ubuntu.com/ubuntu precise main restricted
5
-deb http://us.archive.ubuntu.com/ubuntu precise-updates main restricted
6
-deb http://us.archive.ubuntu.com/ubuntu precise universe
7
-deb http://us.archive.ubuntu.com/ubuntu precise-updates universe
8
-deb http://us.archive.ubuntu.com/ubuntu precise multiverse
9
-deb http://us.archive.ubuntu.com/ubuntu precise-updates multiverse
10
-deb http://us.archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse
11
-deb http://security.ubuntu.com/ubuntu precise-security main restricted
12
-deb http://security.ubuntu.com/ubuntu precise-security universe
13
-deb http://security.ubuntu.com/ubuntu precise-security multiverse

+ 0
- 6
modules/openstack_project/manifests/review.pp View File

@@ -82,18 +82,12 @@ class openstack_project::review (
82 82
   $projects_config = 'openstack_project/review.projects.ini.erb',
83 83
 ) {
84 84
 
85
-  $java_home = $::lsbdistcodename ? {
86
-    'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
87
-    'trusty'  => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
88
-  }
89
-
90 85
   class { 'project_config':
91 86
     url  => $project_config_repo,
92 87
   }
93 88
 
94 89
   $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
95 90
   class { 'openstack_project::gerrit':
96
-    java_home                           => $java_home,
97 91
     git_http_url                        => 'https://git.openstack.org/',
98 92
     canonical_git_url                   => 'git://git.openstack.org/',
99 93
     ssl_cert_file                       => $ssl_cert_file,

+ 13
- 4
modules/openstack_project/manifests/review_dev.pp View File

@@ -28,9 +28,18 @@ class openstack_project::review_dev (
28 28
   $projects_config = 'openstack_project/review-dev.projects.ini.erb',
29 29
 ) {
30 30
 
31
-  $java_home = $::lsbdistcodename ? {
32
-    'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
33
-    'trusty'  => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
31
+  case $::lsbdistcodename {
32
+    'trusty': {
33
+      $jre_package = 'openjdk-7-jre-headless'
34
+      $java_home = '/usr/lib/jvm/java-7-openjdk-amd64/jre'
35
+    }
36
+    'xenial': {
37
+      $jre_package = 'openjdk-8-jre-headless'
38
+      $java_home = '/usr/lib/jvm/java-8-openjdk-amd64/jre'
39
+    }
40
+    default: {
41
+      fail("Operating system release ${::lsbdistcodename} not supported.")
42
+    }
34 43
   }
35 44
 
36 45
   realize (
@@ -202,7 +211,7 @@ class openstack_project::review_dev (
202 211
     unless      => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts  >/dev/null 2>&1",
203 212
     path        => '/bin:/usr/bin',
204 213
     require     => [
205
-      Package['openjdk-7-jre-headless'],
214
+      Package[$jre_package],
206 215
       File['/home/gerrit2/storyboard-dev.crt'],
207 216
     ],
208 217
   }

+ 0
- 8
modules/openstack_project/manifests/status.pp View File

@@ -26,14 +26,6 @@ class openstack_project::status (
26 26
 
27 27
   include ::httpd
28 28
 
29
-  # The Apache mod_version module only needs to be enabled on Ubuntu 12.04
30
-  # as it comes compiled and enabled by default on newer OS, including CentOS
31
-  if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
32
-    httpd::mod { 'version':
33
-      ensure => present
34
-    }
35
-  }
36
-
37 29
   if ! defined(Httpd::Mod['rewrite']) {
38 30
     httpd::mod { 'rewrite':
39 31
         ensure => present,

Loading…
Cancel
Save