Skip to content

Optional servicelevel parameter #91

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 15, 2020
Merged

Optional servicelevel parameter #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fd550f
Optional servicelevel parameter
mroussel Feb 5, 2020
c88b3aa
Keep Standard as default value to not break tests
mroussel Feb 5, 2020
37b8a4a
Merge branch 'master' into optional_servicelevel
waveclaw Feb 15, 2020
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
11 changes: 8 additions & 3 deletions lib/puppet/provider/rhsm_register/subscription_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,16 @@
# or subscriptions in the system. If there are only custom ones, e.g. on a
# katello server there is no ability to define or use service levels.
def subscription_attach
if @resource[:autosubscribe] && !@resource[:servicelevel].nil?
if @resource[:autosubscribe]
Puppet.debug('This server will be attached to a service level')
begin
subscription_manager(['attach',
"--servicelevel=#{@resource[:servicelevel]}", '--auto'])
params = []
params << 'attach'
unless @resource[:servicelevel].nil? || @resource[:servicelevel].empty?
params << "--servicelevel=#{@resource[:servicelevel]}"
end
params << '--auto'
subscription_manager(params)
rescue Puppet::ExecutionFailure => e
Puppet.debug("Auto-attach returned: #{e}")
end
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@
String $pool = '',
String $lifecycleenv = 'library',
Variant[String, Boolean, Enum['yes','no']] $autosubscribe = false,
String $servicelevel = 'Standard',
Variant[String, Boolean, Enum['yes','no']] $force = false,
String $org = 'Default_Organization',
Variant[String, Class] $repo = '',
Hash $config_hash = {},
Optional[String] $servicelevel = 'Standard',
Optional[String] $release = undef,
) {

Expand Down