unify ONE 6.x and 7.0+ support#8
Open
atanas-vladimirov wants to merge 4 commits into
Open
Conversation
Change-Id: I27288272c466a911a47695749dba14618015a352 Signed-off-by: Anton Todorov <a.todorov@storpool.com>
+ add ebtables to the sudoers file + address ebtables directly Change-Id: Iccf1a9d51993b9d608132210e45b42eef07c5735 Signed-off-by: Anton Todorov <a.todorov@storpool.com>
Change-Id: I4e8c9c41816d3603fa68bc4d96bf08869bc0f1eb Signed-off-by: Anton Todorov <a.todorov@storpool.com>
ONE 7.0 introduces OpenNebula::DriverLogger and removes the older OpenNebula.log_info/log_error from scripts_common.rb. Pick whichever module is defined at load time so the same addon tree works on 6.x and 7.0+.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings the three commits from
one-7.0ontomasterso a singleaddon-vnfilter tree works on every OpenNebula version we support:
Adds a small compatibility shim because ONE 7.0 removed
scripts_common.rb(and with itOpenNebula.log_info/OpenNebula.log_error) and replaced it withOpenNebula::DriverLogger. The shim picks whichever module isdefined at load time so the addon works on 6.x and 7.0+ alike.