FYI, this is now pushed to 2.10.
On Wed, Sep 24, 2014 at 12:50 PM, Hrvoje Ribicic <r...@google.com> wrote:
> LGTM, thanks
>
> On Wed, Aug 6, 2014 at 4:51 PM, 'Helga Velroyen' via ganeti-devel <
> ganeti-devel@googlegroups.com> wrote:
>
>> ping?
>>
>>
>> On Tue, Aug 5, 2014 at 9:47 AM, Helga Velroyen <hel...@google.com> wrote:
>>
>>> (resending because of dimara's comment)
>>>
>>>
>>> On Tue, Aug 5, 2014 at 9:47 AM, Helga Velroyen <hel...@google.com>
>>> wrote:
>>>
>>>> This patch renames the constant 'NV_VMNODES' to
>>>> 'NV_NONVMNODES' as it is actually used to store
>>>> a list of *non* vm-capable nodes.
>>>>
>>>> Signed-off-by: Helga Velroyen <hel...@google.com>
>>>> ---
>>>> lib/backend.py | 2 +-
>>>> lib/cmdlib/cluster.py | 2 +-
>>>> src/Ganeti/Constants.hs | 4 ++--
>>>> 3 files changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/lib/backend.py b/lib/backend.py
>>>> index e638e1c..051f774 100644
>>>> --- a/lib/backend.py
>>>> +++ b/lib/backend.py
>>>> @@ -965,7 +965,7 @@ def VerifyNode(what, cluster_name, all_hvparams):
>>>> result = {}
>>>> my_name = netutils.Hostname.GetSysName()
>>>> port = netutils.GetDaemonPort(constants.NODED)
>>>> - vm_capable = my_name not in what.get(constants.NV_VMNODES, [])
>>>> + vm_capable = my_name not in what.get(constants.NV_NONVMNODES, [])
>>>>
>>>> _VerifyHypervisors(what, vm_capable, result, all_hvparams)
>>>> _VerifyHvparams(what, vm_capable, result)
>>>> diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py
>>>> index 9bc0c68..f3b54d1 100644
>>>> --- a/lib/cmdlib/cluster.py
>>>> +++ b/lib/cmdlib/cluster.py
>>>> @@ -2951,7 +2951,7 @@ class LUClusterVerifyGroup(LogicalUnit,
>>>> _VerifyErrors):
>>>> constants.NV_TIME: None,
>>>> constants.NV_MASTERIP: (self.cfg.GetMasterNodeName(), master_ip),
>>>> constants.NV_OSLIST: None,
>>>> - constants.NV_VMNODES: self.cfg.GetNonVmCapableNodeNameList(),
>>>> + constants.NV_NONVMNODES: self.cfg.GetNonVmCapableNodeNameList(),
>>>> constants.NV_USERSCRIPTS: user_scripts,
>>>> }
>>>>
>>>> diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
>>>> index 23e1a2f..756b90e 100644
>>>> --- a/src/Ganeti/Constants.hs
>>>> +++ b/src/Ganeti/Constants.hs
>>>> @@ -3020,8 +3020,8 @@ nvVersion = "version"
>>>> nvVglist :: String
>>>> nvVglist = "vglist"
>>>>
>>>> -nvVmnodes :: String
>>>> -nvVmnodes = "vmnodes"
>>>> +nvNonvmnodes :: String
>>>> +nvNonvmnodes = "nonvmnodes"
>>>>
>>>> -- * Instance status
>>>>
>>>> --
>>>> 2.0.0.526.g5318336
>>>>
>>>>
>>>
>>>
>>> --
>>> Helga Velroyen | Software Engineer | hel...@google.com |
>>>
>>> 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
>>>
>>
>>
>>
>> --
>> Helga Velroyen | Software Engineer | hel...@google.com |
>>
>> 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
>>
>
>
--
Helga Velroyen | Software Engineer | hel...@google.com |
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
