-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update custom provider to return valid package resource info #7
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,16 +14,41 @@ | |
has_feature :versionable | ||
has_feature :install_options | ||
|
||
confine :osfamily => [ :RedHat ] | ||
confine :exists => "/etc/init.d/twdaemon" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Won't this prevent the provider from working if the agent isn't already installed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. removed confines |
||
|
||
def self.prefetch(packages) | ||
packages.each do |name, pkg| | ||
version = get_version(pkg) | ||
pkg.provider = new({:ensure => version, :name => name, :provider => :te_agent_bin}) if version | ||
pkg.provider = new({:name => name, :ensure => version, :provider => :te_agent_bin}) if version | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this changing? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. standardize name before version |
||
end | ||
end | ||
|
||
def self.instances | ||
paths = [] | ||
versions = [] | ||
File.open('/etc/init.d/twdaemon').each_line do |r| | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will error out if the agent isn't installed. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fixed with latest commit : sudodevnull@355c65b |
||
next if r.match(/^#/) | ||
pathn = r.sub(/bin.*/, 'data/version') | ||
npath = pathn.rstrip! | ||
paths.push(npath) | ||
end | ||
paths.each do |path| | ||
vfile = File.open("#{path}") | ||
vfile.each_line do |v| | ||
versionr = /\d.\d.\d/.match(v).to_s | ||
versions.push(versionr) | ||
end | ||
end | ||
versions.each.collect do |version| | ||
new(:name => 'te_agent', :ensure => version, :provider => :te_agent_bin) | ||
end | ||
end | ||
|
||
|
||
def query | ||
version = get_version | ||
version ? {:ensure => version, :name => resource[:name], :provider => :te_agent_bin} : nil | ||
version ? {:name => resource[:name], :ensure => version, :provider => :te_agent_bin} : nil | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this changing? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove the confines and unnecessary spacing |
||
end | ||
|
||
def install | ||
|
@@ -82,7 +107,6 @@ def install_options | |
|
||
def join_options(options) | ||
return unless options | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this changing? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove unnecessary spacing |
||
options.collect do |val| | ||
case val | ||
when Hash | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This provider is used for all non-Windows operating systems.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed confines