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

[WIP] - Added "Container Template" type support in Catalog Item editor #1621

Closed

Conversation

h-kataria
Copy link
Contributor

Updated summary screen to show Container Template specific details

https://www.pivotaltracker.com/story/show/147300897

container_template_type_catalog_item

catalog_item_form

summary_screen

@h-kataria
Copy link
Contributor Author

@lfu @gmcculloug ready to test, i am working on adding spec tests

@h-kataria h-kataria force-pushed the container_template_catalog_item branch from 0c87ed8 to 01f081a Compare June 28, 2017 14:54
@gmcculloug
Copy link
Member

@h-kataria Looks good. @lfu Please test.

@@ -1560,6 +1573,16 @@ def add_ansible_tower_job_template_vars(st)
nil : ConfigurationScript.find_by(:id => @edit[:new][:template_id])
end

def add_ansible_tower_container_template_vars(st)
Copy link
Member

Choose a reason for hiding this comment

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

I think this method is only for container template and not for ansible tower.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lfu this is common method for both types.

@lfu
Copy link
Member

lfu commented Jun 28, 2017

@h-kataria The Entry Point for Reconfigure and Retirement seems disabled in your screen shot. But they are active and selectable in my testing.

Method ServiceTemplateContainerTemplate.create_catalog_item seems not got called when adding a new catalog item. And the container template was not set into the resource actions of the newly added catalog item as a result of that.

st.options = {
:config_info => {
:provision => {
:container_template_id => @edit[:new][:template_id]
Copy link
Member

Choose a reason for hiding this comment

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

This container_template_id is container template specific. How can it be shared with ansible tower? Or that will be added later?

@h-kataria h-kataria force-pushed the container_template_catalog_item branch 3 times, most recently from 877e887 to 29c4227 Compare June 28, 2017 18:08
@miq-bot
Copy link
Member

miq-bot commented Jun 28, 2017

Checked commit h-kataria@29c4227 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
3 files checked, 3 offenses detected

app/controllers/catalog_controller.rb

@lfu
Copy link
Member

lfu commented Jun 28, 2017

@gmcculloug @bzwei For this release, reconfigure and retirement are not supported. Should we hide the entry points for them from UI?
Otherwise, UI change looks good!

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.

5 participants