LGTM, thanks (including the interdiff)
On Mon, Feb 10, 2014 at 12:43 PM, Klaus Aehlig <[email protected]> wrote: > On Mon, Feb 10, 2014 at 12:22:40PM +0100, Klaus Aehlig wrote: > > As all luxi clients talk to luxid now, and masterd will > > go away, remove the option to use socket different from > > luxid's. > > > > Signed-off-by: Klaus Aehlig <[email protected]> > > --- > > lib/runtime.py | 25 ++----------------------- > > 1 file changed, 2 insertions(+), 23 deletions(-) > > Sorry, that was removing a bit too much; I'd like to include the > following interdiff. > > commit c4b7f8272590fead73df88e303f5f61855ce3893 > Author: Klaus Aehlig <[email protected]> > Date: Mon Feb 10 12:37:29 2014 +0100 > > [Interdiff] Remove query option from GetClient > > diff --git a/lib/runtime.py b/lib/runtime.py > index daa32ab..7e91d6b 100644 > --- a/lib/runtime.py > +++ b/lib/runtime.py > @@ -32,6 +32,7 @@ from ganeti import constants > from ganeti import errors > from ganeti import luxi > from ganeti.rpc.errors import NoMasterError > +from ganeti import pathutils > from ganeti import ssconf > from ganeti import utils > > @@ -245,7 +246,7 @@ def GetClient(): > > """ > try: > - client = luxi.Client() > + client = luxi.Client(address=pathutils.QUERY_SOCKET) > except NoMasterError: > ss = ssconf.SimpleStore() > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
