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

added attribute for choosing service Systemd unit type #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fmw_domain/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

default['fmw_domain']['nodemanager_port'] = 5556
default['fmw_domain']['nodemanager_service_description'] = nil
default['fmw_domain']['nodemanager_service_type'] = "simple"

if node['platform_family'] =='windows'
default['fmw_domain']['domains_dir'] = 'C:/oracle/middleware/user_projects/domains'
Expand Down
4 changes: 3 additions & 1 deletion fmw_domain/providers/nodemanager_service_redhat_7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def load_current_resource
@current_resource ||= Chef::ResourceResolver.resolve('fmw_domain_nodemanager_service_redhat_7').new(new_resource.name)
@current_resource.user_home_dir(@new_resource.user_home_dir)
@current_resource.os_user(@new_resource.os_user)
@current_resource.type(@new_resource.type)
@current_resource
end

Expand All @@ -44,7 +45,8 @@ def load_current_resource
mode 0755
variables(script_name: new_resource.name,
user_home_dir: new_resource.user_home_dir,
os_user: new_resource.os_user)
os_user: new_resource.os_user,
type: new_resource.type)
notifies :run, 'execute[systemctl-daemon-reload]', :immediately
notifies :run, 'execute[systemctl-enable]', :immediately
notifies :enable, "service[#{new_resource.name}.service]", :immediately
Expand Down
3 changes: 3 additions & 0 deletions fmw_domain/recipes/nodemanager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@

if (node['platform_family'] == 'rhel' and node['platform_version'] >= '7.0')
location = "#{node['fmw']['user_home_dir']}/#{node['fmw']['os_user']}/#{script_name}"
type = node['fmw_domain']['nodemanager_service_type']
else
location = "/etc/init.d/#{script_name}"
type = false
end

# add linux script to the right location
Expand All @@ -102,6 +104,7 @@
fmw_domain_nodemanager_service script_name do
user_home_dir node['fmw']['user_home_dir']
os_user node['fmw']['os_user']
type type
end
elsif node['os'].include?('solaris2')

Expand Down
3 changes: 3 additions & 0 deletions fmw_domain/resources/nodemanager_service_redhat_7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
attribute :user_home_dir, kind_of: String, required: true
# operating system user
attribute :os_user, kind_of: String, required: true

# process start-up type for this service unit.
attribute :type, kind_of: String, required: false , default: 'simple'
4 changes: 2 additions & 2 deletions fmw_domain/templates/default/nodemanager/systemd
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Description=WebLogic <%= @script_name %> service
After=syslog.target network.target

[Service]
Type=simple
Type=<%= @type %>
ExecStart=<%= @user_home_dir %>/<%= @os_user %>/<%= @script_name %> start
ExecStop=<%= @user_home_dir %>/<%= @os_user %>/<%= @script_name %> stop
TimeoutSec=30
KillMode=process
RemainAfterExit=yes

[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target