| Posted | Nick | Remark | |
|---|---|---|---|
| #openstack-nova - 2018-01-25 | |||
| 18:07:16 | dansmith | jackie-truong: so you're doing what? rebasing the second one on the first, then the third on the second, etc? | |
| 18:07:19 | dansmith | all in separate branches? | |
| 18:07:24 | mriedem | git rebase -i | |
| 18:07:26 | mriedem | is your friend | |
| 18:07:28 | dansmith | yeah | |
| 18:07:34 | mriedem | rebase the entire series at once, | |
| 18:07:40 | mriedem | modify the patches you need | |
| 18:08:16 | mriedem | https://docs.openstack.org/infra/manual/developers.html#rebasing-a-commit | |
| 18:08:22 | jackie-truong | oh. i was definitely doing "rebasing the second one on the first, then the third on the second, etc"... | |
| 18:08:23 | dansmith | then you'll hate us a little less for asking them to be split up :) | |
| 18:08:40 | mriedem | step 2 there can be 'git rebase -i master' | |
| 18:08:48 | mriedem | in which case you get a menu to select the commits you want to edit | |
| 18:09:00 | dansmith | jackie-truong: so do your rebase thing like normal this time, but before you submit, rebase the whole thing on master and then try "git rebase -i master" and see what it gives you | |
| 18:09:26 | izombie | I'm trying to setup nova api manually and paste api seems to evasive. When I'm trying to list servers, I'm getting 404. Any suggestions on what could be the reason? | |
| 18:09:28 | dansmith | i.e. git checkout master; git pull; git checkout last-patch-branch; git rebase -i master | |
| 18:10:25 | jackie-truong | yeah, so i usually rebase on master (git rebase -i master), but that's just for one patch | |
| 18:10:57 | jackie-truong | so you're saying checkout the api patch in this case, then rebase on master | |
| 18:11:45 | dansmith | jackie-truong: well, you have modified the bottom one now, so you need to do your normal rebase one by one thing | |
| 18:11:50 | dansmith | jackie-truong: but then once that is done, | |
| 18:12:03 | dansmith | only use the api patch's branch from now on, and run git rebase -i master from that one | |
| 18:12:20 | jackie-truong | dansmith: got it, thanks! | |
| 18:12:21 | dansmith | jackie-truong: it'll show you all your patches from master on, and let you edit them without changing the stack | |
| 18:12:45 | jackie-truong | so much time has been wasted on individual pushes... | |
| 18:12:47 | dansmith | jackie-truong: then when you git review, it'll show you all the ones pending, and you'll see them all go up in one go here in channel | |
| 18:13:05 | dansmith | jackie-truong: ....yeah :) | |
| 18:14:18 | openstackgerrit | Claudiu Belu proposed openstack/nova master: tests: fixes mock autospec usage https://review.openstack.org/447505 | |
| 18:16:49 | mriedem | git review -y to push the entire stack | |
| 18:16:52 | mriedem | it will prompt you though | |
| 18:16:55 | mriedem | if you don't use -y | |
| 18:17:06 | mriedem | -R if you don't want to rebase unchanged patches at the bottom the stack | |
| 18:17:12 | mriedem | but maybe that's getting advanced | |
| 18:17:14 | dansmith | I never use -y | |
| 18:17:20 | mriedem | git rebase -i HEAD~3 etc | |
| 18:17:31 | dansmith | because if I have messed up the rebase, I might resubmit a year's worth of changes | |
| 18:17:31 | mriedem | i use git rebase -R -y quite often | |
| 18:31:32 | melwitt | mriedem: I'm good with this ironic "get IP address for volume connector" change if you wanted to revisit it https://review.openstack.org/#/c/468353 | |
| 18:39:03 | mriedem | melwitt: ok | |
| 18:52:29 | hrw | hello again | |
| 18:53:00 | hrw | stephenfin: https://paste.fedoraproject.org/paste/2PNsiE0OF0VYnF~sKHdXdw is initial version of 'lets add usb host' patch | |
| 18:53:12 | hrw | stephenfin: I though it will be more complicated | |
| 18:54:53 | mriedem | melwitt: wording question in https://review.openstack.org/#/c/537642/ | |
| 18:56:01 | mriedem | edleafe: i don't think your alternate hosts change is ever going to get out of the check queue... | |
| 18:57:07 | edleafe | mriedem: maybe we need alternate CI | |
| 18:57:10 | edleafe | :) | |
| 19:01:49 | openstackgerrit | melanie witt proposed openstack/nova master: Add release note for QEMU native LUKS decryption https://review.openstack.org/537642 | |
| 19:05:06 | openstackgerrit | Marcin Juszkiewicz proposed openstack/nova master: [dnm] Make sure that we have USB Host controller for tablet https://review.openstack.org/538003 | |
| 19:06:25 | hrw | please take a look as I am not sure is it proper way of doing that | |
| 19:10:23 | openstackgerrit | Matt Riedemann proposed openstack/nova master: Ironic: Get IP address for volume connector https://review.openstack.org/468353 | |
| 19:10:24 | mriedem | melwitt: check my release note update on ^ and see if that's still OK, then i'll +W | |
| 19:13:27 | melwitt | mriedem: looks good to me | |
| 19:14:27 | mriedem | want to put your +2 back on? | |
| 19:14:40 | melwitt | yep done | |
| 19:18:37 | mriedem | efried: so i should defer https://blueprints.launchpad.net/nova/+spec/granular-resource-requests to rocky right? | |
| 19:18:47 | mriedem | i think that was mentioned as a rocky thing at this point in the meeting today | |
| 19:19:26 | efried | mriedem It can't be finished in Q, because dependent on nrp alloc cands work, which probably also won't make Q. But 95% of the code is done and merged (months ago). | |
| 19:19:33 | efried | mriedem So however you want to paperwork that... | |
| 19:19:54 | mriedem | can't functionality use it yet from the API right? | |
| 19:19:57 | efried | correct | |
| 19:20:01 | mriedem | ok, then i'll defer | |
| 19:20:03 | efried | ack | |
| 19:24:53 | mriedem | mgoddard: so on the nova ironic traits stuff, | |
| 19:25:01 | mriedem | it looks like the ironic API changes are done https://review.openstack.org/#/q/topic:bug/1722194+(status:open+OR+status:merged) | |
| 19:25:18 | mriedem | and the ironicclient changes to support it are approved, but not yet released, and today is client release freeze | |
| 19:25:51 | mriedem | and nova would need to bump the minimum required version of this in global-requirements to use the new client stuff, and i think the requirements team is going to freeze the requirements repo after today too | |
| 19:26:24 | mriedem | jlvillal: are you waiting for these ironicclient changes to merge before you do the final ironicclient release for queens? ^ | |
| 19:27:02 | efried | mriedem The nova side stuff isn't all approved yet either FYI: https://review.openstack.org/#/q/status:open+project:openstack/nova+branch:master+topic:bp/ironic-driver-traits | |
| 19:27:09 | mriedem | efried: i know, | |
| 19:27:18 | efried | k :) | |
| 19:27:21 | mriedem | i'm asking because i don't want to waste my time on the nova stuff if the deps won't get merged int time | |
| 19:27:51 | mriedem | the ironic client change failed in the gate with a post failure, so it's going to have at least one recheck yet | |
| 19:28:03 | mriedem | plus a release, plus a g-r bump | |
| 19:28:13 | efried | Not happening today. | |
| 19:28:21 | efried | no chance | |
| 19:28:55 | jlvillal | mriedem, I am not sure rloo and TheJulia know more the current status than me. | |
| 19:29:08 | mriedem | ok jroll is asking in -release too | |
| 19:29:31 | TheJulia | Moving to laptop with battery power | |
| 19:31:46 | TheJulia | mriedem: thanks for the recheck | |
| 19:32:16 | TheJulia | mriedem: yes, waiting for the client changes we need to merge before cutting the release :( | |
| 19:33:27 | rloo | mriedem: the traits work will land for sure; just one client patch in gate. the rescue work has been approved but we need 2 ironic patches to land before client can land. and gate is super not-fast today as you probably know :-( | |
| 19:34:19 | mriedem | there hasn't been any review on the nova patches for rescue, so that's going to be deferred | |
| 19:35:15 | mriedem | also https://review.openstack.org/#/c/508116/ - that doesn't bump the minimum required ironic api version to 1.37 before trying to patch the node with traits | |
| 19:35:19 | mriedem | but that's required isn't it? | |
| 19:35:22 | mriedem | jroll: ^ | |
| 19:35:44 | mriedem | we'll likely need someone to work the nova patches at this point since i'm guessing mgoddard and johnthetubaguy are eating boiled meat at this point | |
| 19:36:59 | rloo | mriedem: boiled meat. yummmy. which is better, doing that or reviewing? i'll take a look at the nova patches in a few min. | |
| 19:37:08 | jroll | I can help too | |
| 19:37:35 | mriedem | well i'm assuming the mv needs to change to 1.37 since that's the ironic api version that added traits support | |
| 19:37:41 | jroll | it doesn't | |
| 19:37:44 | mriedem | i could be wrong, there are a lot of +1s on there | |
| 19:37:44 | jroll | explaining in gerrit now | |
| 19:37:46 | mriedem | ok | |
| 19:38:38 | jroll | comment is there mriedem | |
| 19:38:46 | jroll | and this is the one that needs the api version bump https://review.openstack.org/#/c/532288/9 | |
| 19:39:04 | jroll | since it's grabbing the traits from the node | |
| 19:41:19 | izombie | Trying to list servers and I'm hitting 404 and I can't understand why | |
| 19:41:24 | izombie | Any help? | |
| 19:42:31 | TheJulia | on a plus side jroll, that is the correct version :) | |
| 19:44:14 | jroll | yep! | |
| 19:45:17 | mriedem | izombie: check the nova-api logs | |
| 19:45:37 | mriedem | jroll: ah ok, thanks | |