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

Create catalog item after job templates are created #13893

Merged
merged 1 commit into from
Feb 15, 2017

Conversation

bzwei
Copy link
Contributor

@bzwei bzwei commented Feb 13, 2017

This is to continue the work to create a catalog item after the initial work

@syncrou @gmcculloug please review

service_name = options[:name]
description = options[:description]
config_info = validate_config_info(options)

enhanced_config = config_info.deep_merge(create_job_templates(service_name, description, config_info, auth_user))
Copy link
Member

Choose a reason for hiding this comment

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

@bzwei Should this be marked WIP? I don't see create_job_templates defined anywhere

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Waiting for @syncrou's work be committed. But the spec test does not depend on it.

def self.create_catalog_item(options, _auth_user)
options = options.merge(:service_type => 'atomic', :prov_type => 'generic_ansible_playbook')
def self.create_catalog_item(options, auth_user)
options = options.deep_dup.merge(:service_type => 'atomic', :prov_type => 'generic_ansible_playbook')
Copy link
Contributor

Choose a reason for hiding this comment

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

@bzwei - What changed that would require the call to deep_dup vs. just merge before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes. I don't need deep_dup here. I need to make sure input options are not modified

@miq-bot
Copy link
Member

miq-bot commented Feb 15, 2017

This pull request is not mergeable. Please rebase and repush.

This is to continue the work to create a catalog item after the initial work
@miq-bot
Copy link
Member

miq-bot commented Feb 15, 2017

Checked commit bzwei@472e70e with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks good. 🍪

@syncrou
Copy link
Contributor

syncrou commented Feb 15, 2017

👍 Looks good to me

@gmcculloug gmcculloug merged commit fd86611 into ManageIQ:master Feb 15, 2017
@gmcculloug gmcculloug added this to the Sprint 55 Ending Feb 27, 2017 milestone Feb 15, 2017
@bzwei bzwei deleted the playbook_service_template branch February 16, 2017 15:50
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.

7 participants