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.

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

Jump to bottom

Align with osp-d (neutron-related) #565

Merged
merged 1 commit into from
Oct 13, 2015
Merged

Align with osp-d (neutron-related) #565

merged 1 commit into from
Oct 13, 2015

Conversation

cwolferh
Copy link

@cwolferh cwolferh commented Oct 9, 2015

No description provided.

@cwolferh cwolferh force-pushed the towards_ospd_parity2 branch 2 times, most recently from 5fadbd4 to a1bddf5 Compare October 9, 2015 18:44
jguiditta
jguiditta reviewed Oct 9, 2015
View reviewed changes
puppet/modules/quickstack/manifests/pacemaker/neutron.pp
require => Quickstack::Pacemaker::Resource::Generic['neutron-server'],
}
->
Anchor['pacemaker ordering constraints begin']

} else {
notify { 'neutron-scale resource':
notify { 'not PLUMgrid core plugin':
Copy link
Member

Choose a reason for hiding this comment

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

Why not just drop this notify?

Copy link
Author

Choose a reason for hiding this comment

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

I'm not saying that is a bad thing necessarily, but that feels like more of a refactor and out of scope of this PR (to be clear, even though a "neutron-scale" debug message was printed out, it had nothing to do with neutron-scale, but it did have an impact on dependencies which there is not point in refactoring at this point). The notify's are both a little awkward to begin with IMO, but still I'd rather not touch them here.

@jguiditta
Copy link
Member

I may be missing something here, but don't we want a neutron-server -> neutron-openvswitch-agent order constraint in here?

@cwolferh
BZ #1270288 - Remove neutron-scale resource to align with osp-d
aab6c98 
https://bugzilla.redhat.com/show_bug.cgi?id=1270288

Also separate neutron cleanup resource dependencies so we have:

 neutron-ovs-cleanup-clone
   -> neutron-netns-cleanup-clone
     -> neutron-openvswitch-agent-clone

Note, no depdency on haproxy-clone / keystone-clone, etc.

See related https://bugzilla.redhat.com/show_bug.cgi?id=1266910#c33
@cwolferh
Copy link
Author

Good catch, I've added that.

@cwolferh
Copy link
Author

"pcs constraint show" now includes:

start neutron-server-clone then start neutron-openvswitch-agent-clone (kind:Mandatory)

and

start neutron-ovs-cleanup-clone then start neutron-netns-cleanup-clone (kind:Mandatory)
start neutron-netns-cleanup-clone then start neutron-openvswitch-agent-clone (kind:Mandatory)
start neutron-openvswitch-agent-clone then start neutron-dhcp-agent-clone (kind:Mandatory)

@jguiditta
Copy link
Member

I see the same on my setup, and NeutronScale is not missing as expected, good to merge!

jguiditta added a commit that referenced this pull request Oct 13, 2015
@jguiditta
Merge pull request #565 from cwolferh/towards_ospd_parity2
d8a464a 
Align with osp-d (neutron-related)
@jguiditta jguiditta merged commit d8a464a into redhat-openstack:master Oct 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cwolferh @jguiditta