Skip to content

Commit 5222a2c

Browse files
Ramesh7Ramesh7
authored
Merge pull request #568 from puppetlabs/maint-updating-tomcat-min-version
(MAINT) Removing tomcat8 and adding tomcat10
2 parents 4856e61 + 26d09d0 commit 5222a2c

File tree

6 files changed

+210
-222
lines changed

6 files changed

+210
-222
lines changed

‎spec/acceptance/acceptance_1_readme_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
pp = <<-MANIFEST
2020
class{'java':}
2121
tomcat::install { '/opt/tomcat':
22-
source_url => '#{TOMCAT8_RECENT_SOURCE}',
22+
source_url => '#{TOMCAT9_RECENT_SOURCE}',
2323
}
2424
tomcat::instance { 'default':
2525
catalina_home => '/opt/tomcat',
@@ -85,7 +85,7 @@ class { 'java': }
8585
run_shell('rm -rf /opt/apache-tomcat*', expect_failures: true)
8686
end
8787

88-
{ '8' => TOMCAT8_RECENT_SOURCE, '9' => TOMCAT9_RECENT_SOURCE }.each do |key, value|
88+
{ '9' => TOMCAT9_RECENT_SOURCE, '10' => TOMCAT10_RECENT_SOURCE }.each do |key, value|
8989
context "when tomcat #{key} is installed remove_default_webapps => ['docs', 'examples']" do
9090
install_tomcat = <<-MANIFEST
9191
tomcat::install { '/opt/tomcat#{key}':

‎spec/acceptance/acceptance_1b_spec.rb‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
require 'spec_helper_acceptance'
44

55
# puppetlabs-gcc doesn't work on sles
6-
SKIP_GCC = (os[:family] == 'sles')
7-
stop_test = SKIP_TOMCAT_8 || SKIP_GCC
6+
stop_test = (os[:family] == 'sles')
87

98
describe 'Acceptance case one', unless: stop_test do
109
after :all do
@@ -29,7 +28,7 @@
2928
end
3029
end
3130

32-
let(:daemon_version) { '1.3.4' }
31+
let(:daemon_version) { '1.4.0' }
3332

3433
context 'Initial install Tomcat and verification' do
3534
it 'applies the manifest without error' do
@@ -70,54 +69,54 @@ class jsvc {
7069
7170
# The default
7271
tomcat::install { '/opt/apache-tomcat':
73-
user => 'tomcat8',
74-
group => 'tomcat8',
75-
source_url => '#{TOMCAT8_RECENT_SOURCE}',
72+
user => 'tomcat9',
73+
group => 'tomcat9',
74+
source_url => '#{TOMCAT9_RECENT_SOURCE}',
7675
allow_insecure => true,
7776
}
7877
-> class { 'jsvc': } ->
7978
tomcat::instance { 'tomcat_one':
80-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
81-
user => 'tomcat8',
82-
group => 'tomcat8',
79+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
80+
user => 'tomcat9',
81+
group => 'tomcat9',
8382
java_home => $java_home,
8483
use_jsvc => true,
8584
}
86-
tomcat::config::server { 'tomcat8-jsvc':
87-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
85+
tomcat::config::server { 'tomcat9-jsvc':
86+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
8887
port => '80',
8988
}
90-
tomcat::config::server::connector { 'tomcat8-jsvc':
91-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
89+
tomcat::config::server::connector { 'tomcat9-jsvc':
90+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
9291
port => '80',
9392
protocol => 'HTTP/1.1',
9493
additional_attributes => {
9594
'redirectPort' => '443'
9695
},
9796
}
98-
tomcat::config::server::connector { 'tomcat8-jsvc-8080':
99-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
97+
tomcat::config::server::connector { 'tomcat9-jsvc-8080':
98+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
10099
port => '8080',
101100
protocol => 'HTTP/1.1',
102101
additional_attributes => {
103102
'redirectPort' => '443'
104103
},
105104
}
106-
tomcat::config::server::connector { 'tomcat8-ajp':
107-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
105+
tomcat::config::server::connector { 'tomcat9-ajp':
106+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
108107
connector_ensure => 'absent',
109108
port => '8309',
110109
}
111110
tomcat::war { 'war_one.war':
112-
user => 'tomcat8',
113-
group => 'tomcat8',
114-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
111+
user => 'tomcat9',
112+
group => 'tomcat9',
113+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
115114
war_source => '#{SAMPLE_WAR}',
116115
allow_insecure => true,
117116
}
118117
tomcat::setenv::entry { 'JAVA_HOME':
119-
user => 'tomcat8',
120-
group => 'tomcat8',
118+
user => 'tomcat9',
119+
group => 'tomcat9',
121120
value => $java_home,
122121
}
123122
MANIFEST
@@ -145,10 +144,10 @@ class jsvc {
145144
tomcat::service { 'jsvc-default':
146145
service_ensure => stopped,
147146
catalina_home => '/opt/apache-tomcat',
148-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
147+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
149148
use_jsvc => true,
150149
java_home => $java_home,
151-
user => 'tomcat8',
150+
user => 'tomcat9',
152151
}
153152
MANIFEST
154153
apply_manifest(pp)
@@ -169,10 +168,10 @@ class jsvc {
169168
tomcat::service { 'jsvc-default':
170169
service_ensure => running,
171170
catalina_home => '/opt/apache-tomcat',
172-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
171+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
173172
use_jsvc => true,
174173
java_home => $java_home,
175-
user => 'tomcat8',
174+
user => 'tomcat9',
176175
}
177176
MANIFEST
178177
apply_manifest(pp, catch_failures: true, acceptable_exit_codes: [0, 2])
@@ -189,7 +188,7 @@ class jsvc {
189188
it 'applies the manifest without error' do
190189
pp = <<-MANIFEST
191190
tomcat::war { 'war_one.war':
192-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
191+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
193192
war_source => '#{SAMPLE_WAR}',
194193
war_ensure => absent,
195194
}
@@ -209,19 +208,19 @@ class jsvc {
209208
pp = <<-MANIFEST
210209
$java_home = '#{java_home}'
211210
212-
tomcat::config::server::connector { 'tomcat8-jsvc':
211+
tomcat::config::server::connector { 'tomcat9-jsvc':
213212
connector_ensure => 'absent',
214-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
213+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
215214
port => '80',
216215
notify => Tomcat::Service['jsvc-default']
217216
}
218217
tomcat::service { 'jsvc-default':
219218
service_ensure => running,
220219
catalina_home => '/opt/apache-tomcat',
221-
catalina_base => '/opt/apache-tomcat/tomcat8-jsvc',
220+
catalina_base => '/opt/apache-tomcat/tomcat9-jsvc',
222221
java_home => $java_home,
223222
use_jsvc => true,
224-
user => 'tomcat8',
223+
user => 'tomcat9',
225224
}
226225
MANIFEST
227226
apply_manifest(pp, catch_failures: true, acceptable_exit_codes: [0, 2])

0 commit comments

Comments
 (0)