Skip to content
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

Add missing ConfigurationScriptSource hierarchy and Automate models #14069

Merged
merged 5 commits into from
Feb 24, 2017

Conversation

blomquisg
Copy link
Member

@blomquisg blomquisg commented Feb 24, 2017

See #13879

When adding (and rebasing and rebasing and rebasing) #13879, the changes to ConfigurationScriptSource` model hierarchy were dropped.

This adds the model hierarchy back in and adds the appropriate automate models.

This also fixes the AnsibleTower inventory collection to specify the correct models in the InventoryCollectionDefault, the Parser (for credential records), and the Refresher spec (for ConfigurationScriptSource).

@blomquisg blomquisg changed the title Add missing ConfigurationScriptSource hierarchy and Automate models [WIP] Add missing ConfigurationScriptSource hierarchy and Automate models Feb 24, 2017
@blomquisg blomquisg added the wip label Feb 24, 2017
@blomquisg blomquisg removed the wip label Feb 24, 2017
@blomquisg blomquisg changed the title [WIP] Add missing ConfigurationScriptSource hierarchy and Automate models Add missing ConfigurationScriptSource hierarchy and Automate models Feb 24, 2017
Copy link
Member

@Fryguy Fryguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM...just needs the specs fixed.

@blomquisg
Copy link
Member Author

just needs the specs fixed.

D'oh, I fixed refresher_spec and missed refresher_v2_spec.

@miq-bot
Copy link
Member

miq-bot commented Feb 24, 2017

Checked commits blomquisg/manageiq@a6add48~...eee4cc6 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
20 files checked, 1 offense detected

app/models/manageiq/providers/ansible_tower/inventory/parser/automation_manager.rb

@blomquisg blomquisg mentioned this pull request Feb 24, 2017
2 tasks
@Fryguy Fryguy merged commit 93597dd into ManageIQ:master Feb 24, 2017
@Fryguy Fryguy added this to the Sprint 55 Ending Feb 27, 2017 milestone Feb 24, 2017
@blomquisg blomquisg deleted the embedded_ansible_missing_models branch November 28, 2017 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants