summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <iwienand@redhat.com>2018-02-16 09:50:09 +1100
committerIan Wienand <iwienand@redhat.com>2018-02-16 10:11:53 +1100
commite0e08a36135fb90ac948b7ce428a21e20a698b7e (patch)
tree5ca8abcbd8f583a7df43c627da4653baaa3ca825
parente3043006a08fa3814d2a7204a9cda42e27684eb2 (diff)
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
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 21 Feb 2018 14:05:58 +0000 Reviewed-on: https://review.openstack.org/545157 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--modules/openstack_project/files/sources.list.precise.amd6413
-rw-r--r--modules/openstack_project/manifests/review.pp6
-rw-r--r--modules/openstack_project/manifests/review_dev.pp17
-rw-r--r--modules/openstack_project/manifests/status.pp8
4 files changed, 13 insertions, 31 deletions
diff --git a/modules/openstack_project/files/sources.list.precise.amd64 b/modules/openstack_project/files/sources.list.precise.amd64
deleted file mode 100644
index 1d94ffa..0000000
--- a/modules/openstack_project/files/sources.list.precise.amd64
+++ /dev/null
@@ -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
4deb http://us.archive.ubuntu.com/ubuntu precise main restricted
5deb http://us.archive.ubuntu.com/ubuntu precise-updates main restricted
6deb http://us.archive.ubuntu.com/ubuntu precise universe
7deb http://us.archive.ubuntu.com/ubuntu precise-updates universe
8deb http://us.archive.ubuntu.com/ubuntu precise multiverse
9deb http://us.archive.ubuntu.com/ubuntu precise-updates multiverse
10deb http://us.archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse
11deb http://security.ubuntu.com/ubuntu precise-security main restricted
12deb http://security.ubuntu.com/ubuntu precise-security universe
13deb http://security.ubuntu.com/ubuntu precise-security multiverse
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 2cc8921..631819a 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -82,18 +82,12 @@ class openstack_project::review (
82 $projects_config = 'openstack_project/review.projects.ini.erb', 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 class { 'project_config': 85 class { 'project_config':
91 url => $project_config_repo, 86 url => $project_config_repo,
92 } 87 }
93 88
94 $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}" 89 $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
95 class { 'openstack_project::gerrit': 90 class { 'openstack_project::gerrit':
96 java_home => $java_home,
97 git_http_url => 'https://git.openstack.org/', 91 git_http_url => 'https://git.openstack.org/',
98 canonical_git_url => 'git://git.openstack.org/', 92 canonical_git_url => 'git://git.openstack.org/',
99 ssl_cert_file => $ssl_cert_file, 93 ssl_cert_file => $ssl_cert_file,
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 125231f..05d2da3 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -28,9 +28,18 @@ class openstack_project::review_dev (
28 $projects_config = 'openstack_project/review-dev.projects.ini.erb', 28 $projects_config = 'openstack_project/review-dev.projects.ini.erb',
29) { 29) {
30 30
31 $java_home = $::lsbdistcodename ? { 31 case $::lsbdistcodename {
32 'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre', 32 'trusty': {
33 'trusty' => '/usr/lib/jvm/java-7-openjdk-amd64/jre', 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 realize ( 45 realize (
@@ -202,7 +211,7 @@ class openstack_project::review_dev (
202 unless => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts >/dev/null 2>&1", 211 unless => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts >/dev/null 2>&1",
203 path => '/bin:/usr/bin', 212 path => '/bin:/usr/bin',
204 require => [ 213 require => [
205 Package['openjdk-7-jre-headless'], 214 Package[$jre_package],
206 File['/home/gerrit2/storyboard-dev.crt'], 215 File['/home/gerrit2/storyboard-dev.crt'],
207 ], 216 ],
208 } 217 }
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index a148bea..479e495 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -26,14 +26,6 @@ class openstack_project::status (
26 26
27 include ::httpd 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 if ! defined(Httpd::Mod['rewrite']) { 29 if ! defined(Httpd::Mod['rewrite']) {
38 httpd::mod { 'rewrite': 30 httpd::mod { 'rewrite':
39 ensure => present, 31 ensure => present,