Re: Any pythonista willing to help backport some cloud-init changes?
Oh, right, cool! I thought it's not proper to exclude the tests, but whatever works. I've rebuilt the RPMs and will ask the user to repeat the tests (and whoever else is up for it!). http://li.nux.ro/download/nux/tmp/cloud-init7/ Once we agree it works I can ask the CentOS guys for an updated package. Thanks for assistance Rene! Lucian -- Sent from the Delta quadrant using Borg technology! Nux! www.nux.ro - Original Message - > From: "Rene Moser" <m...@renemoser.net> > To: "dev" <dev@cloudstack.apache.org> > Sent: Thursday, 28 December, 2017 17:56:10 > Subject: Re: Any pythonista willing to help backport some cloud-init changes? > On 12/28/2017 05:57 PM, Nux! wrote: >> 1 out of 2 hunks FAILED -- saving rejects to file >> tests/unittests/test_datasource/test_cloudstack.py.rej > > No python magic needed here, only git magic :) > So only the tests part did not apply, I would just "exclude" those... > > git am --exclude=tests/unittests/test_datasource/test_cloudstack.py > da1db792b2721d94ef85df8c136e78012c49c6e5.patch > > I amended the commit message and addded the source commit id, here is > the patch for 0.7.9: > > https://github.com/resmo/cloud-init/commit/6a89a904ce2d12047f6d0c1944706e63a950ae83.patch > > Regards > René
Re: Any pythonista willing to help backport some cloud-init changes?
On 12/28/2017 05:57 PM, Nux! wrote: > 1 out of 2 hunks FAILED -- saving rejects to file > tests/unittests/test_datasource/test_cloudstack.py.rej No python magic needed here, only git magic :) So only the tests part did not apply, I would just "exclude" those... git am --exclude=tests/unittests/test_datasource/test_cloudstack.py da1db792b2721d94ef85df8c136e78012c49c6e5.patch I amended the commit message and addded the source commit id, here is the patch for 0.7.9: https://github.com/resmo/cloud-init/commit/6a89a904ce2d12047f6d0c1944706e63a950ae83.patch Regards René
Re: Any pythonista willing to help backport some cloud-init changes?
Hi, That patch does not apply cleanly to cloud-init 0.7.9 tarball. It needs some adapting by someone who understands python. cloud-init-0.7.9]$ patch -p1 < ../da1db792b2721d94ef85df8c136e78012c49c6e5.patch patching file cloudinit/sources/DataSourceCloudStack.py Hunk #1 succeeded at 186 (offset -1 lines). patching file tests/unittests/test_datasource/test_cloudstack.py Hunk #1 FAILED at 1. Hunk #2 succeeded at 79 (offset -10 lines). 1 out of 2 hunks FAILED -- saving rejects to file tests/unittests/test_datasource/test_cloudstack.py.rej -- Sent from the Delta quadrant using Borg technology! Nux! www.nux.ro - Original Message - > From: "Rene Moser" <m...@renemoser.net> > To: "dev" <dev@cloudstack.apache.org> > Sent: Thursday, 28 December, 2017 16:23:25 > Subject: Re: Any pythonista willing to help backport some cloud-init changes? > Jo Nux > > On 12/28/2017 10:04 AM, Nux! wrote: >> Hi, >> >> I've been made aware by a user that there is an issue (regression) with the >> latest cloud-init in CentOS, in that the Cloudstack data source does not >> parse >> dhcp lease files with "-" in them. >> There's a fix, but it does not apply cleanly. Can someone have a go at it? >> https://bugs.launchpad.net/cloud-init/+bug/1717147 >> https://github.com/cloud-init/cloud-init/commit/da1db792b2721d94ef85df8c136e78012c49c6e5 > > I didn't get what you mean "not apply cleanly"? Need more infos and > context. What is the problem with the patch > https://github.com/cloud-init/cloud-init/commit/da1db792b2721d94ef85df8c136e78012c49c6e5 > ? > > Regards > René
Re: Any pythonista willing to help backport some cloud-init changes?
Jo Nux On 12/28/2017 10:04 AM, Nux! wrote: > Hi, > > I've been made aware by a user that there is an issue (regression) with the > latest cloud-init in CentOS, in that the Cloudstack data source does not > parse dhcp lease files with "-" in them. > There's a fix, but it does not apply cleanly. Can someone have a go at it? > https://bugs.launchpad.net/cloud-init/+bug/1717147 > https://github.com/cloud-init/cloud-init/commit/da1db792b2721d94ef85df8c136e78012c49c6e5 I didn't get what you mean "not apply cleanly"? Need more infos and context. What is the problem with the patch https://github.com/cloud-init/cloud-init/commit/da1db792b2721d94ef85df8c136e78012c49c6e5 ? Regards René
Any pythonista willing to help backport some cloud-init changes?
Hi, I've been made aware by a user that there is an issue (regression) with the latest cloud-init in CentOS, in that the Cloudstack data source does not parse dhcp lease files with "-" in them. There's a fix, but it does not apply cleanly. Can someone have a go at it? https://bugs.launchpad.net/cloud-init/+bug/1717147 https://github.com/cloud-init/cloud-init/commit/da1db792b2721d94ef85df8c136e78012c49c6e5 Once we get the patch properly integrated we can ask the CentOS project to issue an update. Having said that, I've built in the interim some packages with a very basic patch and you can find them here, I've been told they do fix the issue, but try at your own risk: http://li.nux.ro/download/nux/tmp/cloud-init7/ -- Sent from the Delta quadrant using Borg technology! Nux! www.nux.ro
