shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

B #3929: fix wrong relative path for remote hooks (#3944)

Browse Source
This commit is contained in:
Christian González 2019-11-15 11:21:19 +01:00 committed by Ruben S. Montero
parent d06a8101a9
commit d0a3f4af56
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hem/etc/onehem-server.conf
View File

@ -31,7 +31,10 @@
################################################################################
# :hook_base_path location of hook scripts when commands not given as an
# absolute path
# :remote_hook_base_path location of hook scripts when commands not given as an
# absolute path and REMOTE = yes is specified
:hook_base_path: '/var/lib/one/remotes/hooks'
:remote_hook_base_path: '/var/tmp/one/hooks'
# :subscriber_endpoint to subscribe for OpenNebula events must match those in
# oned.conf

29
src/hem/onehem-server.rb
View File

@ -24,6 +24,7 @@ if !ONE_LOCATION
ETC_LOCATION = '/etc/one'
LIB_LOCATION = '/usr/lib/one'
HOOK_LOCATION = '/var/lib/one/remotes/hooks'
REMOTE_HOOK_LOCATION = '/var/tmp/one/hooks'
RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
GEMS_LOCATION = '/usr/share/one/gems'
else
@ -32,6 +33,7 @@ else
ETC_LOCATION = ONE_LOCATION + '/etc'
LIB_LOCATION = ONE_LOCATION + '/lib'
HOOK_LOCATION = ONE_LOCATION + '/var/remotest/hooks'
REMOTE_HOOK_LOCATION = '/var/tmp/one/hooks'
RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION = ONE_LOCATION + '/share/gems'
end
@ -166,7 +168,7 @@ module HEMHook
end
def remote?
self['TEMPLATE/REMOTE'].casecmp('YES').zero?
self['TEMPLATE/REMOTE'].casecmp('YES').zero? rescue false
end
def as_stdin?
@ -344,11 +346,12 @@ class HookExecutionManager
# Default configuration options, overwritten in hem.conf
# --------------------------------------------------------------------------
DEFAULT_CONF = {
:hook_base_path => HOOK_LOCATION,
:subscriber_endpoint => 'tcp://localhost:2101',
:replier_endpoint => 'tcp://localhost:2102',
:debug_level => 2,
:concurrency => 10
:hook_base_path => HOOK_LOCATION,
:remote_hook_base_path => REMOTE_HOOK_LOCATION,
:subscriber_endpoint => 'tcp://localhost:2101',
:replier_endpoint => 'tcp://localhost:2102',
:debug_level => 2,
:concurrency => 10
}
# --------------------------------------------------------------------------
@ -575,7 +578,13 @@ class HookExecutionManager
@logger.info("Executing hook for #{hook.key}")
rc = hook.execute(@conf[:hook_base_path], params, host)
rc = nil
if hook.remote?
rc = hook.execute(@conf[:remote_hook_base_path], params, host)
else
rc = hook.execute(@conf[:hook_base_path], params, host)
end
if rc == -1
@logger.error('No remote host specified for a remote hook.')
@ -607,7 +616,11 @@ class HookExecutionManager
remote_host = body.xpath('//REMOTE_HOST')[0]
host = remote_host.text unless remote_host.nil?
rc = hook.execute(@conf[:hook_base_path], args, host)
if hook.remote?
rc = hook.execute(@conf[:remote_hook_base_path], params, host)
else
rc = hook.execute(@conf[:hook_base_path], params, host)
end
xml_response = build_response_body(args, rc, host, !host.empty?, true)