Skip to content

Add os_family #11

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 2 commits into from
Oct 14, 2015
Merged

Add os_family #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65be818
Add os_family
Oct 13, 2015
d9ae03e
Add os_family for ptables
Oct 13, 2015
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
7 changes: 5 additions & 2 deletions foreman_medium.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def ensure(module):
name = module.params['name']
path = module.params['path']
state = module.params['state']
os_family = module.params['os_family']

foreman_host = module.params['foreman_host']
foreman_port = module.params['foreman_port']
Expand All @@ -32,6 +33,7 @@ def ensure(module):
module.fail_json(msg='Could not get medium: {0}'.format(e.message))

data['path'] = path
data['os_family'] = os_family

if not medium and state == 'present':
try:
Expand All @@ -47,12 +49,12 @@ def ensure(module):
return True, medium
except ForemanError as e:
module.fail_json('Could not delete medium: {0}'.format(e.message))
if medium.get('path') != path:
if medium.get('path') != path or medium.get('os_family') != os_family:
try:
medium = theforeman.update_medium(id=medium.get('id'), data=data)
return True, medium
except ForemanError as e:
module.fail_json('Could not update medium: {0}'.format(e.message))
module.fail_json(msg='Could not update medium: {0}'.format(e.message))

return False, medium

Expand All @@ -62,6 +64,7 @@ def main():
argument_spec=dict(
name=dict(type='str', required=True),
path=dict(type='str', required=False),
os_family=dict(type='str', required=False),
state=dict(type='str', default='present', choices=['present', 'absent']),
foreman_host=dict(type='str', default='127.0.0.1'),
foreman_port=dict(type='str', default='443'),
Expand Down
3 changes: 3 additions & 0 deletions foreman_ptable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def ensure():
name = module.params['name']
layout = module.params['layout']
state = module.params['state']
os_family = module.params['os_family']

data = dict(name=name)

Expand All @@ -82,6 +83,7 @@ def ensure():
module.fail_json(msg='Could not get partition table: {0}'.format(e.message))

data['layout'] = layout
data['os_family'] = os_family

if not ptable and state == 'present':
try:
Expand All @@ -108,6 +110,7 @@ def main():
argument_spec=dict(
name=dict(type='str', required=True),
layout=dict(type='str', required=False),
os_family=dict(type='str', required=False),
state=dict(type='str', default='present', choices=['present', 'absent']),
foreman_host=dict(type='str', default='127.0.0.1'),
foreman_port=dict(type='str', default='443'),
Expand Down