Skip to content
This repository was archived by the owner on Feb 28, 2020. It is now read-only.

Commit fc79a15

Browse files
author
Edwin Biemond
committed
added chef 14 plus 12.2.1.3 support
1 parent 637d3bd commit fc79a15

37 files changed

+77
-64
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change Log
22

3+
## chef-samples v0.1.5 (10 July 2018)
4+
- Also supports chef 14
5+
- RCU 11g unzip issue with common & soa_suite recipe
6+
- support for WebLogic/FMW 12.2.1.3
7+
38
## chef-samples v0.1.4 (1 May 2017)
49
- Support chef 13, use v0.1.3 release for chef 11
510
- Drop support for chef 11

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Oracle WebLogic CHEF cookbooks
22

33
## Chef support
4-
- Version 12, 13 ( use v0.1.3 release for chef 11 support)
4+
- Version 12, 13, 14 ( use v0.1.3 release for chef 11 support)
55
- Chef solo, client/server
66
- Databags (encrypted)
77

8-
## WebLogic Chef 12 & 13 Support for
8+
## WebLogic Chef 12, 13 & 14 Support for
99
- The installation & configuration of the JDK, WebLogic and Fusion Middleware (FMW) software
1010
- WebLogic & FMW patching
1111
- WebLogic version 10.3.6, 11.1, 12.1 & 12.2

fmw_bsu/metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
license 'MIT'
55
description 'Patch Oracle WebLogic 10.3.6 or 12.1.1'
66
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7-
version '0.1.4'
7+
version '0.1.5'
88

99
recipe "fmw_bsu",
1010
"This is an empty recipe and does not do anything"

fmw_domain/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The fmw_domain cookbook allows you to create a WebLogic (FMW) Domain with FMW ex
2828

2929
## Cookbook description
3030

31-
This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2 ) on any Windows, Linux or Solaris host or VM.
31+
This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2, 12.2.1.3 ) on any Windows, Linux or Solaris host or VM.
3232

3333
## Setup
3434

fmw_domain/libraries/helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def self.listening?(command, port, column)
1818
end
1919

2020
def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic_password, repository_password)
21-
if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2'
21+
if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' or version == '12.2.1.3'
2222
wlst_script_dir = "#{weblogic_home_dir}/../oracle_common/common/bin"
2323
else
2424
wlst_script_dir = "#{weblogic_home_dir}/common/bin"
@@ -30,7 +30,7 @@ def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic
3030
end
3131

3232
def self.wlst_execute_windows(version, script_file, weblogic_home_dir, weblogic_password, repository_password)
33-
if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2'
33+
if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' or version == '12.2.1.3'
3434
wlst_script_dir = "#{weblogic_home_dir}\\..\\oracle_common\\common\\bin"
3535
else
3636
wlst_script_dir = "#{weblogic_home_dir}\\common\\bin"

fmw_domain/metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
license 'MIT'
55
description 'Create a WebLogic (FMW) Domain with FMW extensions on a Windows, Linux or Solaris host'
66
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7-
version '0.1.4'
7+
version '0.1.5'
88

99
recipe "fmw_domain",
1010
"This is an empty recipe and does not do anything"

fmw_domain/recipes/domain.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
fail 'did not find the data_bag_item' if domain_params.length == 0
4343

44-
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
44+
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
4545
wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/wls/wls.jar"
4646
elsif ['10.3.6', '12.1.1'].include?(node['fmw']['version'])
4747
wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/domains/wls.jar"

fmw_domain/recipes/extension_bam.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM'
5353
end
5454

55-
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
55+
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
5656
if node['fmw']['version'] == '12.1.2'
5757
return
5858
elsif node['fmw']['version'] == '12.1.3'

fmw_domain/recipes/extension_enterprise_scheduler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
bam_cluster = ''
4545
end
4646

47-
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
47+
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
4848
if node['fmw']['version'] == '12.1.2'
4949
return
5050
elsif node['fmw']['version'] == '12.1.3'

fmw_domain/recipes/extension_jrf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
restricted = false
2323

24-
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
24+
if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
2525
if node['fmw']['version'] == '12.1.2'
2626
wls_em_template = "#{node['fmw']['middleware_home_dir']}/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar"
2727
wls_jrf_template = "#{node['fmw']['middleware_home_dir']}/oracle_common/common/templates/wls/oracle.jrf_template_12.1.2.jar"

0 commit comments

Comments
 (0)