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

Link service resources of bundled service correctly #18251

Merged

Conversation

d-m-u
Copy link
Contributor

@d-m-u d-m-u commented Nov 29, 2018

This fixes an issue with the provisioning of bundled services that was introduced in https://github.com/ManageIQ/manageiq/pull/16799/files#diff-9257fff45a7d1258305c9a6b7d15e322R198, a pr which changed service_template.rb to use the block form of create. The issue with this is that when we get to the "add_resource" call the child service isn't saved yet and does not have an ID which causes the service resource to be saved with a resource_type but without a resource_id.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1653648

It was originally #18250 but that got closed because master and hammer both have the service retire task logic implemented as part of retirement as a request.

@d-m-u
Copy link
Contributor Author

d-m-u commented Nov 29, 2018

@miq-bot add_label bug
@miq-bot assign @gmcculloug
@miq-bot add_reviewer @tinaafitz
@miq-bot add_label hammer/yes
@miq-bot add_label blocker

@d-m-u
Copy link
Contributor Author

d-m-u commented Nov 29, 2018

@miq-bot add_label fine/yes
@miq-bot add_label gaprindashvili/yes

Copy link
Member

@tinaafitz tinaafitz left a comment

Choose a reason for hiding this comment

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

@d-m-u Looks good.

@d-m-u d-m-u force-pushed the fixing_service_bundle_resource_linking branch from 6e65b7d to d038d01 Compare November 29, 2018 23:05
@miq-bot
Copy link
Member

miq-bot commented Nov 29, 2018

Checked commit d-m-u@d038d01 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 👍

@gmcculloug gmcculloug merged commit 4cdafdb into ManageIQ:master Nov 29, 2018
simaishi pushed a commit that referenced this pull request Nov 30, 2018
…inking

Link service resources of bundled service correctly

(cherry picked from commit 4cdafdb)

https://bugzilla.redhat.com/show_bug.cgi?id=1655081
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit dd593c38442ce6d6d6fd6e1338156a8ee663b7d8
Author: Greg McCullough <[email protected]>
Date:   Thu Nov 29 18:48:45 2018 -0500

    Merge pull request #18251 from d-m-u/fixing_service_bundle_resource_linking
    
    Link service resources of bundled service correctly
    
    (cherry picked from commit 4cdafdbf809ecf69b80b210abfcd5c7f28629259)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1655081

simaishi pushed a commit that referenced this pull request Nov 30, 2018
…inking

Link service resources of bundled service correctly

(cherry picked from commit 4cdafdb)

https://bugzilla.redhat.com/show_bug.cgi?id=1653648
@simaishi
Copy link
Contributor

Hammer backport details:

$ git log -1
commit b14870058edc22e3e60f26064a928c11cb5a9240
Author: Greg McCullough <[email protected]>
Date:   Thu Nov 29 18:48:45 2018 -0500

    Merge pull request #18251 from d-m-u/fixing_service_bundle_resource_linking
    
    Link service resources of bundled service correctly
    
    (cherry picked from commit 4cdafdbf809ecf69b80b210abfcd5c7f28629259)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1653648

simaishi pushed a commit that referenced this pull request Dec 20, 2018
…inking

Link service resources of bundled service correctly

(cherry picked from commit 4cdafdb)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1660601
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit 0e8b4a6be576fd687dadab110db31856b1a5f78d
Author: Greg McCullough <[email protected]>
Date:   Thu Nov 29 18:48:45 2018 -0500

    Merge pull request #18251 from d-m-u/fixing_service_bundle_resource_linking
    
    Link service resources of bundled service correctly
    
    (cherry picked from commit 4cdafdbf809ecf69b80b210abfcd5c7f28629259)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1660601

@d-m-u d-m-u deleted the fixing_service_bundle_resource_linking branch February 1, 2019 20:47
@mfeifer mfeifer added this to the Sprint 100 Ending Dec 3, 2018 milestone Jan 27, 2020
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.

6 participants