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

Commit 27d9be7

Browse files
author
Edwin Biemond
committed
Work started on supported chef 13 & drop chef 11
1 parent 102f446 commit 27d9be7

File tree

28 files changed

+66
-94
lines changed

28 files changed

+66
-94
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
# Change Log
22

3+
## chef-samples v0.1.4 (1 May 2017)
4+
- Support chef 13, use v0.1.3 release for chef 11
5+
- Drop support for chef 11
6+
- allow to name the windows nodemanager
7+
38
## chef-samples v0.1.3 (6 Dec 2016)
49

510
- support for WebLogic/FMW 12.2.1.2
611
- state_attr fixes in some resources
7-
- fmw_inst fix in version
12+
- fmw_inst fix in version
813

914
## chef-samples v0.1.2 (12 Jul 2016)
1015

README.md

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

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

8-
## WebLogic Chef 11 & 12 Support for
8+
## WebLogic Chef 12 & 13 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
@@ -15,7 +15,7 @@
1515
- Extend the domain with ADF/JRF, SOA Suite, Service Bus, Webtier etc
1616

1717
## Restrictions
18-
- Will not download of all the required JDK, WebLogic or FMW software from OTN. They should be available on the host (local or from a share)
18+
- Will not download of all the required JDK, WebLogic or FMW software from OTN. They should be available on the host (local or from a share)
1919
- Does not download patches from https://support.oracle.com
2020
- Does not give you the right to use all the FMW software
2121
- Check your license or make sure you comply with the OTN developer license agreement

fmw_domain/providers/nodemanager_service_windows.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def load_current_resource
7777
cwd new_resource.bin_dir
7878
environment ({ 'CLASSPATH' => "#{new_resource.middleware_home_dir}\\wlserver_10.3\\server\\lib\\weblogic.jar",
7979
'JAVA_HOME' => new_resource.java_home_dir,
80-
'PROD_NAME' => local_prod_name,
80+
'PROD_NAME' => local_prod_name,
8181
'SERVICE_DESCRIPTION' => new_resource.service_description })
8282
end
8383
else

fmw_jdk/.kitchen.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
driver:
33
name: vagrant
4-
provider: vmware_fusion
4+
# provider: vmware_fusion
55

66
provisioner:
77
name: chef_solo
8+
# require_chef_omnibus: 12
89

910
platforms:
1011
- name: debian-7.2.0
@@ -13,23 +14,23 @@ platforms:
1314
memory: 2048
1415
cpus: 1
1516
synced_folders:
16-
- ["/Users/edwinbiemond/software", "/software"]
17+
- ["C:/software", "/software"]
1718
- name: oel-7.0
1819
driver_config:
19-
box: OEL-7.2-x86_64
20+
box: OEL7_2-x86_64
2021
customize:
2122
memory: 2048
2223
cpus: 1
2324
synced_folders:
24-
- ["/Users/edwinbiemond/software", "/software"]
25+
- ["C:/software", "/software"]
2526
- name: oel-6.6
2627
driver_config:
27-
box: OEL6_6-x86_64
28+
box: OEL6_6-x86_64_plain
2829
customize:
2930
memory: 2048
3031
cpus: 1
3132
synced_folders:
32-
- ["/Users/edwinbiemond/software", "/software"]
33+
- ["C:/software", "/software"]
3334
- name: oel-5.8
3435
driver_config:
3536
box: OEL-5.8
@@ -63,7 +64,7 @@ platforms:
6364
memory: 3072
6465
cpus: 2
6566
synced_folders:
66-
- ["/Users/edwinbiemond/software", "/software"]
67+
- ["C:/software", "/software"]
6768
- name: windows-8.1
6869
transport:
6970
name: winrm
@@ -73,17 +74,17 @@ platforms:
7374
memory: 3072
7475
cpus: 2
7576
synced_folders:
76-
- ["/Users/edwinbiemond/software", "/software"]
77+
- ["C:/software", "/software"]
7778

7879
suites:
7980
- name: exe
8081
run_list:
8182
- recipe[fmw_jdk::install]
8283
attributes:
8384
fmw:
84-
java_home_dir: "C:/java/jdk1.8.0_111"
85+
java_home_dir: "C:/java/jdk1.8.0_131"
8586
fmw_jdk:
86-
source_file: "/Users/edwinbiemond/software/jdk-8u111-windows-x64.exe"
87+
source_file: "C:/software/jdk-8u131-windows-x64.exe"
8788
excludes:
8889
- debian-7.2.0
8990
- oel-7.0
@@ -97,9 +98,9 @@ suites:
9798
- recipe[fmw_jdk::rng_service]
9899
attributes:
99100
fmw:
100-
java_home_dir: "/usr/java/jdk1.8.0_111"
101+
java_home_dir: "/usr/java/jdk1.8.0_131"
101102
fmw_jdk:
102-
source_file: "/software/jdk-8u111-linux-x64.rpm"
103+
source_file: "/software/jdk-8u131-linux-x64.rpm"
103104
excludes:
104105
- debian-7.2.0
105106
- windows-2012r2
@@ -127,9 +128,9 @@ suites:
127128
- recipe[fmw_jdk::rng_service]
128129
attributes:
129130
fmw:
130-
java_home_dir: "/usr/java/jdk1.8.0_111"
131+
java_home_dir: "/usr/java/jdk1.8.0_131"
131132
fmw_jdk:
132-
source_file: "/software/jdk-8u111-linux-x64.tar.gz"
133+
source_file: "/software/jdk-8u131-linux-x64.tar.gz"
133134
excludes:
134135
- windows-2012r2
135136
- windows-8.1
@@ -154,9 +155,9 @@ suites:
154155
- recipe[fmw_jdk::install]
155156
attributes:
156157
fmw:
157-
java_home_dir: "/usr/jdk/instances/jdk1.8.0_40"
158+
java_home_dir: "/usr/jdk/instances/jdk1.8.0_131"
158159
fmw_jdk:
159-
source_file: "/software/jdk-8u40-solaris-x64.tar.gz"
160+
source_file: "/software/jdk-8u131-solaris-x64.tar.gz"
160161
excludes:
161162
- windows-2012r2
162163
- windows-8.1

fmw_jdk/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 'Installs Oracle JDK 7,8 on any Windows, Linux or Solaris host'
66
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7-
version '0.1.3'
7+
version '0.1.4'
88

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

fmw_jdk/providers/jdk_linux.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def initialize(*args)
2525

2626
def load_current_resource
2727
Chef::Log.info('jdk provider, jdk_linux provider load current resource')
28-
@current_resource ||= Chef::Resource::FmwJdkJdkLinux.new(new_resource.name)
28+
@current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux).new(new_resource.name)
2929
@current_resource.java_home_dir(@new_resource.java_home_dir)
3030
@current_resource.source_file(@new_resource.source_file)
3131

fmw_jdk/providers/jdk_linux_rpm.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def initialize(*args)
2828

2929
def load_current_resource
3030
Chef::Log.info('jdk provider, jdk_linux_rpm provider load current resource')
31-
@current_resource ||= Chef::Resource::FmwJdkJdkLinuxRpm.new(new_resource.name)
31+
@current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux_rpm).new(new_resource.name)
3232
@current_resource.java_home_dir(@new_resource.java_home_dir)
3333
@current_resource.source_file(@new_resource.source_file)
3434

fmw_jdk/providers/jdk_solaris.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def initialize(*args)
2626

2727
def load_current_resource
2828
Chef::Log.info('jdk provider, jdk_solaris provider load current resource')
29-
@current_resource ||= Chef::Resource::FmwJdkJdkSolaris.new(new_resource.name)
29+
@current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris).new(new_resource.name)
3030
@current_resource.java_home_dir(@new_resource.java_home_dir)
3131
@current_resource.source_file(@new_resource.source_file)
3232
@current_resource.source_x64_file(@new_resource.source_x64_file)

fmw_jdk/providers/jdk_solaris_z.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def initialize(*args)
2626

2727
def load_current_resource
2828
Chef::Log.info('jdk provider, jdk_solaris_z provider load current resource')
29-
@current_resource ||= Chef::Resource::FmwJdkJdkSolarisZ.new(new_resource.name)
29+
@current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris_z).new(new_resource.name)
3030
@current_resource.java_home_dir(@new_resource.java_home_dir)
3131
@current_resource.source_file(@new_resource.source_file)
3232
@current_resource.source_x64_file(@new_resource.source_x64_file)

fmw_jdk/providers/jdk_windows.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def initialize(*args)
2121

2222
def load_current_resource
2323
Chef::Log.info('jdk provider, jdk_windows provider load current resource')
24-
@current_resource ||= Chef::Resource::FmwJdkJdkWindows.new(new_resource.name)
24+
@current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_windows).new(new_resource.name)
2525
@current_resource.java_home_dir(@new_resource.java_home_dir)
2626
@current_resource.source_file(@new_resource.source_file)
2727

0 commit comments

Comments
 (0)