Skip to content

[4.0] Make ovs of_inactivity_probe configurable from neutron barclamp#2162

Merged
nicolasbock merged 1 commit into
crowbar:stable/4.0from
zzaimeche:soc7-inactivity-probe
Jul 10, 2019
Merged

[4.0] Make ovs of_inactivity_probe configurable from neutron barclamp#2162
nicolasbock merged 1 commit into
crowbar:stable/4.0from
zzaimeche:soc7-inactivity-probe

Conversation

@zzaimeche

@zzaimeche zzaimeche commented Jul 5, 2019

Copy link
Copy Markdown
Contributor

This patch allows the user to change
the ovs inactivity_probe timeout from the neutron barclamp, in the 'raw'
view. Previously, this value was always set to the OVS default, 5.

It provides crowbar support for this upstream patch:

https://review.opendev.org/#/c/663024/

@nicolasbock nicolasbock left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could you clean up the commit message and remove the "conflicts"?

As far as I understand, SOC 7 is Newton based. Are we backporting the patch you reference to Newton? Upstream it doesn't seem like it is.

@@ -0,0 +1,15 @@
def upgrade(tattr, tdep, attr, dep)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The migration should be 124.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it's a backport to Newton. Newton is EoL upstream so there's no corresponding upstream patch for that branch; we have it in for Pike and up. I can remove the note about the conflicts.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You also need to rename the migration file 😄

"crowbar-revision": 0,
"crowbar-applied": false,
"schema-revision": 123,
"schema-revision": 307,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Revision is 124.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok, thanks, I wasn't sure if 124 would conflict with a later patch in soc8 so I left it the same as the version on master, but I can change that.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

No, it shouldn't. We jump to the next hundred with each release, i.e. SOC 8 -> 200, SOC 9 -> 300.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Cool, thanks for explaining. :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

No problem 😄

@zzaimeche zzaimeche force-pushed the soc7-inactivity-probe branch from 1bc4d8b to 1e6205b Compare July 5, 2019 11:58
@@ -0,0 +1,15 @@
def upgrade(tattr, tdep, attr, dep)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You also need to rename the migration file 😄

This patch allows the user to change
the ovs inactivity_probe timeout from the neutron barclamp, in the 'raw'
view. Previously, this value was always set to the OVS default, 5.

It provides crowbar support for this upstream patch:

https://review.opendev.org/#/c/663024/
@zzaimeche zzaimeche force-pushed the soc7-inactivity-probe branch from 1e6205b to c0a4d9e Compare July 8, 2019 10:32
@Itxaka Itxaka changed the title Make ovs of_inactivity_probe configurable from neutron barclamp [4.0] Make ovs of_inactivity_probe configurable from neutron barclamp Jul 10, 2019
@Itxaka Itxaka requested a review from nicolasbock July 10, 2019 10:42

@nicolasbock nicolasbock left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks!

@nicolasbock nicolasbock merged commit 43761a6 into crowbar:stable/4.0 Jul 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants