On Wed, Sep 09, 2015 at 04:30:03PM +0200, 'Lisa Velden' via ganeti-devel wrote:
commit da6c57e9d91fef99ea7f0ced7f2df11eac352360
Merge: 8d75918 fb23e79
Author: Lisa Velden <[email protected]>
Date: Wed Sep 9 16:21:22 2015 +0200
Merge branch 'stable-2.16'
I'd just add " into master" here (no need to resend)
* stable-2.16
Add a test to accept existing offline violations
Make redundant and allocGlobalN1 honor AcceptExisting
Make accept-existing an algorithmic option
* stable-2.15
Revision bump for 2.15.1
Update NEWS file for 2.15.1
Metad: ignore instances that have no communication NIC
* stable-2.14
Add error code to OpPrereqError use
bdev: Allow userspace-only disk templates
Export disk's userspace URI to OS scripts
Fix instance failover in case of DTS_EXT_MIRROR
Only insist on haskell test dependencies if needed
* stable-2.13
Fix typo in example
Update documentation of --print-jobid
* stable-2.12
Add forgotten IPOLICY_SPINDLE_RATIO to __all__ variable
Make QA turn on user-shutdown when testing it
Fix disabling of user shutdown reporting
Make confd answer disk requests querying by name
gnt-node add: password auth is only one method
* stable-2.11
(no changes)
* stable-2.10
(no changes)
* stable-2.9
Document quoting of special values in key-value parameters
replace-disks: fix --ignore-ipolicy
Conflicts:
src/Ganeti/HTools/AlgorithmParams.hs
Resolution:
src/Ganeti/HTools/AlgorithmParams.hs: take both additions
diff --cc src/Ganeti/HTools/AlgorithmParams.hs
index 3d33f7d,c49eed1..deee223
--- a/src/Ganeti/HTools/AlgorithmParams.hs
+++ b/src/Ganeti/HTools/AlgorithmParams.hs
@@@ -60,8 -54,8 +60,10 @@@ data AlgorithmOptions = AlgorithmOption
, algCapacity :: Bool -- ^ Whether to check capacity
properties,
-- like global N+1 redundancy
, algRestrictToNodes :: Maybe [String] -- ^ nodes to restrict
allocation to
+ , algAllowedNodes :: Maybe (Set.Set Int) -- ^ if given, do not perform
any
+ -- operations involving other nodes
+ , algAcceptExisting :: Bool -- ^ accept existing violations in
capacity
+ -- checks
}
-- | Obtain the relevant algorithmic option from the commandline options
@@@ -77,7 -70,7 +79,8 @@@ fromCLIOptions opts = AlgorithmOption
, algMinGainLimit = CLI.optMinGainLim opts
, algCapacity = CLI.optCapacity opts
, algRestrictToNodes = CLI.optRestrictToNodes opts
+ , algAllowedNodes = Nothing
+ , algAcceptExisting = CLI.optAcceptExisting opts
}
-- | Default options for the balancing algorithm
--
Lisa Velden
Software Engineer
[email protected]
Google Germany GmbH
Dienerstra??e 12
80331 M??nchen
Gesch??ftsf??hrer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Rest LGTM, thanks
