| *** zane has joined #openstack-dns | 00:00 | |
| *** matsuhashi has joined #openstack-dns | 00:05 | |
| *** krow has joined #openstack-dns | 00:40 | |
| *** nosnos has joined #openstack-dns | 01:05 | |
| *** ekarlso has quit IRC | 01:33 | |
| *** matsuhashi has quit IRC | 02:16 | |
| *** matsuhashi has joined #openstack-dns | 02:21 | |
| *** matsuhashi has quit IRC | 02:29 | |
| *** matsuhashi has joined #openstack-dns | 02:30 | |
| *** zane has quit IRC | 02:54 | |
| *** zane has joined #openstack-dns | 03:03 | |
| *** zane1 has joined #openstack-dns | 04:37 | |
| *** zane has quit IRC | 04:37 | |
| *** zane1 has quit IRC | 04:38 | |
| *** zane has joined #openstack-dns | 04:38 | |
| *** vipul-away is now known as vipul | 04:38 | |
| *** zane has quit IRC | 04:45 | |
| *** zane has joined #openstack-dns | 04:46 | |
| *** zane has quit IRC | 05:20 | |
| *** matsuhas_ has joined #openstack-dns | 05:57 | |
| *** matsuhashi has quit IRC | 05:58 | |
| *** nosnos_ has joined #openstack-dns | 05:58 | |
| *** nosnos has quit IRC | 05:59 | |
| *** ekarlso has joined #openstack-dns | 06:21 | |
| *** ekarlso has quit IRC | 06:26 | |
| *** ekarlso has joined #openstack-dns | 06:26 | |
| *** matsuhas_ has quit IRC | 06:57 | |
| *** nosnos has joined #openstack-dns | 07:02 | |
| *** nosnos_ has quit IRC | 07:02 | |
| *** matsuhashi has joined #openstack-dns | 07:05 | |
| *** pasquier-s has joined #openstack-dns | 07:39 | |
| *** matsuhashi has quit IRC | 07:40 | |
| *** matsuhashi has joined #openstack-dns | 07:42 | |
| *** matsuhashi has quit IRC | 07:42 | |
| *** matsuhashi has joined #openstack-dns | 07:44 | |
| *** matsuhashi has quit IRC | 07:45 | |
| *** matsuhashi has joined #openstack-dns | 07:48 | |
| *** matsuhashi has quit IRC | 07:48 | |
| *** matsuhashi has joined #openstack-dns | 08:13 | |
| *** ppenjoy has joined #openstack-dns | 09:13 | |
| *** ppenjoy has left #openstack-dns | 09:34 | |
| *** krow has quit IRC | 09:40 | |
| *** eankutse has joined #openstack-dns | 10:11 | |
| *** eankutse has quit IRC | 10:15 | |
| *** eankutse has joined #openstack-dns | 10:15 | |
| *** eankutse1 has joined #openstack-dns | 12:07 | |
| *** eankutse has quit IRC | 12:11 | |
| *** eankutse1 has quit IRC | 12:12 | |
| *** ppenjoy has joined #openstack-dns | 12:42 | |
| *** ppenjoy has left #openstack-dns | 12:44 | |
| *** betsy has quit IRC | 12:48 | |
| *** nosnos has quit IRC | 13:13 | |
| *** eankutse has joined #openstack-dns | 13:13 | |
| *** eankutse has quit IRC | 13:14 | |
| *** eankutse has joined #openstack-dns | 13:14 | |
| *** eankutse has quit IRC | 13:15 | |
| *** eankutse has joined #openstack-dns | 13:15 | |
| *** openstackgerrit has quit IRC | 13:22 | |
| *** openstackgerrit has joined #openstack-dns | 13:22 | |
| *** ChanServ sets mode: +v openstackgerrit | 13:22 | |
| *** betsy has joined #openstack-dns | 13:38 | |
| *** zane has joined #openstack-dns | 14:16 | |
| *** adrian_otto has joined #openstack-dns | 14:42 | |
| openstackgerrit | Monty Taylor proposed a change to stackforge/python-designateclient: Updated from global requirements https://review.openstack.org/48972 | 14:51 |
|---|---|---|
| *** adrian_otto has quit IRC | 14:56 | |
| *** adrian_otto has joined #openstack-dns | 14:57 | |
| *** adrian_otto has quit IRC | 15:18 | |
| *** matsuhashi has quit IRC | 15:25 | |
| *** adrian_otto has joined #openstack-dns | 15:41 | |
| *** msisk has joined #openstack-dns | 16:01 | |
| *** mikal has quit IRC | 16:40 | |
| *** mikal has joined #openstack-dns | 16:49 | |
| *** msisk has quit IRC | 17:00 | |
| *** yidclare has joined #openstack-dns | 17:00 | |
| *** ekarlso has quit IRC | 17:13 | |
| *** ekarlso has joined #openstack-dns | 17:22 | |
| *** msisk has joined #openstack-dns | 17:22 | |
| *** adrian_otto has quit IRC | 17:26 | |
| *** adrian_otto has joined #openstack-dns | 17:35 | |
| *** eankutse has quit IRC | 17:36 | |
| *** eankutse has joined #openstack-dns | 17:36 | |
| *** ekarlso has quit IRC | 17:39 | |
| *** ekarlso has joined #openstack-dns | 17:39 | |
| eankutse | Hello Kiall | 17:41 |
| eankutse | I am having gerrit issues | 17:41 |
| *** adrian_otto has quit IRC | 17:44 | |
| Kiall | eankutse: just grabbing some dinner.. will be back after.. | 17:48 |
| eankutse | ok. | 17:49 |
| *** msisk has quit IRC | 17:51 | |
| *** msisk has joined #openstack-dns | 18:18 | |
| *** msisk has quit IRC | 18:19 | |
| *** msisk has joined #openstack-dns | 18:25 | |
| *** jmcbride has joined #openstack-dns | 18:29 | |
| *** msisk has quit IRC | 18:32 | |
| *** krow has joined #openstack-dns | 18:41 | |
| *** openstackgerrit has quit IRC | 18:47 | |
| *** openstackgerrit has joined #openstack-dns | 18:47 | |
| *** ChanServ sets mode: +v openstackgerrit | 18:47 | |
| Kiall | eankutse: heya | 18:49 |
| eankutse | Hello Kiall | 18:54 |
| *** krow has quit IRC | 18:55 | |
| Kiall | eankutse: so .. whats up with gerrit? :) | 18:55 |
| eankutse | At some point, I was dong a git review to submit code, then that led to a the need to merge with tsimmons' backend/impl_bind9 changes | 18:56 |
| eankutse | I was supposed to do a rebase -i continue | 18:57 |
| eankutse | but I forgot and did a git commit -a —amend | 18:57 |
| eankutse | now I am having problems when I do a git review | 18:57 |
| eankutse | this is the error: | 18:57 |
| *** vipul has quit IRC | 18:57 | |
| eankutse | remote: Resolving deltas: 100% (3/3) | 18:58 |
| eankutse | remote: Processing changes: refs: 1, done | 18:58 |
| eankutse | To ssh://emmanuel.ankutse@review.openstack.org:29418/stackforge/designate.git | 18:58 |
| eankutse | ! [remote rejected] HEAD -> refs/publish/master/bug/1214869 (you are not allowed to upload merges) | 18:58 |
| eankutse | error: failed to push some refs to 'ssh://emmanuel.ankutse@review.openstack.org:29418/stackforge/designate.git' | 18:58 |
| *** vipul has joined #openstack-dns | 18:58 | |
| Kiall | eankutse: so, in your history you have a merge commit - nobody is allowed upload merge commits to Gerrit (for any of the OpenStack projects) | 18:58 |
| eankutse | yes. That was the first mistake | 18:59 |
| Kiall | git log origin/master..master | 18:59 |
| Kiall | replacing the last master with your branch name | 18:59 |
| Kiall | that'll show the commits you're trying to upload | 18:59 |
| Kiall | Before it will let you continue, that merge commit needs to be taken care of :( | 19:00 |
| eankutse | hmmm… :-( | 19:02 |
| Kiall | Yea .. So .. If you have "My Commit", "merge", "my second accidental commit" | 19:03 |
| eankutse | The commit does not look familiar: | 19:03 |
| eankutse | git log origin/master..bug/1214869 | 19:03 |
| eankutse | commit d7ea0504f836c99ce81e9d0d7eecf52e63e066be | 19:03 |
| eankutse | Merge: b3ad5fd 6934fb0 | 19:03 |
| eankutse | Author: Jenkins <jenkins@review.openstack.org> | 19:03 |
| eankutse | Date: Thu Sep 26 16:51:55 2013 +0000 | 19:03 |
| *** eankutse has quit IRC | 19:03 | |
| Kiall | you can go ahead and merge the commits into one | 19:03 |
| *** eankutse has joined #openstack-dns | 19:03 | |
| Kiall | ugh .. gotta love rate limits ;) | 19:03 |
| eankutse | I keep blowing the IRC up | 19:03 |
| *** krow has joined #openstack-dns | 19:03 | |
| eankutse | so the above is what I see when I pull the commit history | 19:04 |
| Kiall | can you drop it on paste.openstack.org ? | 19:05 |
| Kiall | IRC cut most of it off | 19:05 |
| Kiall | (usually, when pasting more than 1/2 lines.. you should use a pastebin to avoid IRC killing you :)) | 19:06 |
| eankutse | k | 19:14 |
| eankutse | paste #47716 | 19:15 |
| eankutse | http://paste.openstack.org/show/47719/ | 19:17 |
| Kiall | eankutse: so, I assume your trying to update the "Update domains when servers are created, modified or deleted" review? | 19:17 |
| eankutse | that's right | 19:17 |
| Kiall | is that the first commit that's not shown? | 19:17 |
| Kiall | If it is, I'd grab it's sha1, then `git checkout $sha1 && git branch -D $branch-name && git checkout -b $branch-name` | 19:18 |
| eankutse | I do not see my Change-Id and commit message when I do the git log ... | 19:18 |
| Kiall | that'll just get rid of those 3 commits.. | 19:18 |
| Kiall | Is what's up on https://review.openstack.org/#/c/45078/ the latest? | 19:19 |
| Kiall | Sha1 was baecdb0d5af4696c9891bef8aa7a043a0083d972 | 19:19 |
| Kiall | or .. pastebin `git log -10` | 19:19 |
| Kiall | it should have it in there too :) | 19:19 |
| Kiall | also .. `git config --global pull.rebase true` can help avoid these situations if it was caused by `git pull` | 19:20 |
| eankutse | what's on https://review.openstack.org/#/c/45078/ is NOT the lastest | 19:20 |
| eankutse | The latest has not made it over yet | 19:20 |
| eankutse | that's what I am trying to get over | 19:21 |
| eankutse | when I made the mistake | 19:21 |
| Kiall | Okay .. Lets get `git log -5` or `git log -10` - need to see where that commit is so we can see how to fix ity | 19:21 |
| Kiall | it* | 19:21 |
| eankutse | I can't see any history of my commits. Even when I do git log −15 | 19:25 |
| eankutse | Would you like for me to still post what I see? | 19:26 |
| eankutse | s/post/paste/ | 19:26 |
| Kiall | humm | 19:27 |
| Kiall | what does `git status` show? | 19:27 |
| Kiall | If that doesn't say you're in the middle of a merge or rebase.. then `git reflog` - You're commit will be there somewhere | 19:28 |
| Kiall | Once you have it's sha1 from reflog, you can `git checkout $sha1 && git branch -D $branch-name && git checkout -b $branch-name` | 19:28 |
| eankutse | # On branch bug/1214869 | 19:28 |
| eankutse | # Changes not staged for commit: | 19:28 |
| eankutse | # (use "git add <file>..." to update what will be committed) | 19:28 |
| eankutse | # (use "git checkout -- <file>..." to discard changes in working directory) | 19:28 |
| eankutse | # | 19:28 |
| eankutse | #modified: designate/backend/impl_bind9.py | 19:28 |
| eankutse | #modified: doc/source/backends/bind9.rst | 19:28 |
| eankutse | # | 19:28 |
| eankutse | no changes added to commit (use "git add" and/or "git commit -a") | 19:28 |
| Kiall | I take it those are tsimmons changes to the bind9 stuff? | 19:29 |
| eankutse | Those are tsimmons + my changes to that file. I had lost my changes at some point so I just added it back in | 19:30 |
| eankutse | I did not change bind9.rst however | 19:30 |
| Kiall | Okay .. I think things have gone haywire somewhere, not sure how! :) | 19:30 |
| Kiall | Best bet is to find the commit sha1 which you did earlier, which git reflog will show | 19:31 |
| eankutse | really haywire | 19:31 |
| eankutse | ok. I'l do git reflog to get the sha1 and do what you suggested above | 19:31 |
| Kiall | `git reflog` basically shows everything you've done.. It can be confusing.. but the commit *is* in there | 19:32 |
| Kiall | e.g. http://paste.openstack.org/show/te5rgn1sN98uiBVv1cza/ | 19:32 |
| Kiall | starting from the bottom, original commit + 4 amends, another commit, then using rebase to swap the order of the commits | 19:33 |
| eankutse | THis is paste of reflog http://paste.openstack.org/show/47721/ | 19:33 |
| Kiall | It looks like L21 is your commit? | 19:34 |
| eankutse | yes. that is mine | 19:34 |
| Kiall | I mean, it looks like the commit you are trying to get back to? | 19:34 |
| Kiall | `git checkout 890c3f7 && git branch -D bug/1214869 && git checkout -b bug/1214869` | 19:36 |
| Kiall | that'll bring you back to that commit at the top of the bug/1214869 branch | 19:36 |
| Kiall | Immediately after that commit in the logs was where the merge was introduced | 19:36 |
| artom | Should I even be attempting to reuse the existing bind9-zone.jinja2 template for zone export? | 19:36 |
| Kiall | (reflogs have the most recent changes at the top.) | 19:37 |
| artom | It's having far more far-reaching consequences than I thought :/ | 19:37 |
| Kiall | artom: well, export and "writing a zonefile for bind" should in theory be identical. | 19:37 |
| Kiall | (since the export format would be the RFC a.k.a. bind9 format..) | 19:38 |
| artom | That's the theory, yes... | 19:38 |
| artom | But when you're looking at how Pecan loads its templates because it refuses the full path you gave it... | 19:38 |
| Kiall | Aha .. Yes, I'm pretty sure I would avoid using Pecan's templating, instead rendering a string the same way the bind9 backend does | 19:39 |
| Kiall | then, you can just return that sting | 19:39 |
| Kiall | string* | 19:39 |
| artom | Gotcha | 19:40 |
| artom | I'll put in a bit more effort to see if I can make it work without refactoring all evarything, but I won't obsess over it. | 19:41 |
| Kiall | artom: so, you should be able to do this.. 1 sec | 19:41 |
| Kiall | https://github.com/stackforge/designate/blob/master/designate/utils.py#L104 | 19:42 |
| Kiall | https://github.com/stackforge/designate/blob/master/designate/backend/impl_bind9.py#L136 | 19:42 |
| Kiall | Just, call the render_template, rather than render_template_to_file method | 19:42 |
| Kiall | with the domains/records | 19:43 |
| Kiall | domain/records* | 19:43 |
| artom | Okay | 19:44 |
| artom | Essentially what you're saying is, "export is special, don't bother going through the views and all that jazz" | 19:45 |
| *** betsy has quit IRC | 19:47 | |
| Kiall | artom: so .. yea, I would argue it's special .. it's doing something totally different to any of the other APIs | 19:49 |
| Kiall | and I'd much rather see code reuse between export and the bind9 backend | 19:49 |
| artom | That indeed makes a lot of sense. | 19:51 |
| artom | Would be weird if they gave different results :P | 19:51 |
| eankutse | Kiall: would the git -D bug/1214869 not cause me to loose stuff? | 19:55 |
| ekarlso | Kiall: https://review.openstack.org/#/c/48972/ mordred just pinged me about it | 19:55 |
| Kiall | ekarlso: lol .. impatient ;) | 20:00 |
| Kiall | eankutse: it'll delete the branch, but the commits still exist in your repo | 20:00 |
| Kiall | right after deleting it, we checkout the "good commit" and recreate the branch using it | 20:00 |
| Kiall | as the starting point | 20:00 |
| eankutse | Ahh. Git, git, git :-) | 20:01 |
| Kiall | ekarlso: -1'd mordreds change, we're incompatible with jsonschema v2 | 20:02 |
| ekarlso | ah | 20:03 |
| *** betsy has joined #openstack-dns | 20:32 | |
| openstackgerrit | Emmanuel Ankutse proposed a change to stackforge/designate: Update domains when servers are created, modified or deleted https://review.openstack.org/45078 | 20:38 |
| Kiall | eankutse: I take it you got it sorted? | 20:39 |
| eankutse | yes, I think so. Thanks for your help. :-) | 20:39 |
| Kiall | No problem.. Will review in the am - late here and too tired to think clearly ;) | 20:39 |
| eankutse | Yes. Have a good rest! | 20:40 |
| Kiall | rest? hah .. had to take most of the day off, trying to catch up ;) | 20:42 |
| artom | Actually, if you're still awake, I'd like to pick your brain on how to handle the origin for zonefile import. | 21:16 |
| Kiall | artom: I had planned to make the origin a required part of the zonefile | 21:16 |
| artom | Ok. | 21:18 |
| artom | So then the request body would be "pure" zonefile. | 21:18 |
| artom | No JSON with origin: blah, zonefile: blah nonsense... | 21:18 |
| Kiall | To start with, yea.. Just enforcing the request has a Content-Type of "text/dns" | 21:20 |
| Kiall | later, if we want to support things like "amends" (or just adding an origin) we could allow application/json as well | 21:20 |
| Kiall | (text/dns is the registered mime type for zone files..) | 21:21 |
| artom | Yeah, I have it sending text/dns for export. | 21:23 |
| Kiall | Cool :) | 21:29 |
| artom | Adding an origin post-facto seems... funny? | 21:31 |
| artom | I can see the use-case for it, but conceptually it makes me smile. | 21:32 |
| Kiall | Yea, It seems odd :) I can see eventually allowing POST {"name": "bla.com.", "zonefile": ..... } | 21:32 |
| Kiall | But.. The simpler, the better :) | 21:33 |
| *** adrian_otto has joined #openstack-dns | 21:33 | |
| artom | It should probably also be made very explicitly clear in the errors/exceptions that for now the origin statement is required. | 21:35 |
| artom | I imagine quite a few people have zonefiles without it... | 21:35 |
| Kiall | artom: Yea, without a doubt :) | 21:36 |
| *** eankutse has quit IRC | 21:48 | |
| *** jmcbride has quit IRC | 21:54 | |
| *** zane has quit IRC | 21:58 | |
| *** krow has quit IRC | 22:13 | |
| *** vipul is now known as vipul-away | 22:26 | |
| *** krow has joined #openstack-dns | 22:31 | |
| *** vipul-away is now known as vipul | 22:35 | |
| *** shakayumi has joined #openstack-dns | 23:00 | |
| *** adrian_otto has quit IRC | 23:56 | |
| *** adrian_otto has joined #openstack-dns | 23:56 | |
| *** matsuhashi has joined #openstack-dns | 23:58 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!