commit 01e904c4fc4a8a3e9b8ba95c7dc9066a177ea4fd
Merge: d8e7d84 7f85040
Author: Petr Pudlak <[email protected]>
Date: Thu Jul 9 14:45:43 2015 +0200
Merge branch 'stable-2.15' into master
* stable-2.15
(no news)
* stable-2.14
Move _ValidateConfig to the verify.py submodule
Fix building of shell command in export
Add test showing a bug in location score calculation
Bugfix for cluster location score calculation
* stable-2.13
Properly get rid of all watcher jobs
Move stdout_of to qa_utils
Describe --no-verify-disks option in watcher man page
Make disk verification optional
* stable-2.12
Tell git to ignore tools/ssl-update
Use 'exclude_daemons' option for master only
Disable superfluous restarting of daemons
Add tests exercising the "crashed" state handling
Add proper handling of the "crashed" Xen state
Handle SSL setup when downgrading
Write SSH ports to ssconf files
Noded: Consider certificate chain in callback
Cluster-keys-replacement: update documentation
Backend: Use timestamp as serial no for server cert
UPGRADE: add note about 2.12.5
NEWS: Mention issue 1094
man: mention changes in renew-crypto
Verify: warn about self-signed client certs
Bootstrap: validate SSL setup before starting noded
Clean up configuration of curl request
Renew-crypto: remove superflous copying of node certs
Renew-crypto: propagate verbose and debug option
Noded: log the certificate and digest on noded startup
QA: reload rapi cert after renew crypto
Prepare-node-join: use common functions
Renew-crypto: remove dead code
Init: add master client certificate to configuration
Renew-crypto: rebuild digest map of all nodes
Noded: make "bootstrap" a constant
node-daemon-setup: generate client certificate
tools: Move (Re)GenerateClientCert to common
Renew cluster and client certificates together
Init: create the master's client cert in bootstrap
Renew client certs using ssl_update tool
Run functions while (some) daemons are stopped
Back up old client.pem files
Introduce ssl_update tool
x509 function for creating signed certs
Add tools/common.py from 2.13
Consider ECDSA in SSH setup
Update documentation of watcher and RAPI daemon
Watcher: add option for setting RAPI IP
When connecting to Metad fails, log the full stack trace
Set up the Metad client with allow_non_master
Set up the configuration client properly on non-masters
Add the 'allow_non_master' option to the WConfd RPC client
Add the option to disable master checks to the RPC client
Add 'allow_non_master' to the Luxi test transport class too
Add 'allow_non_master' to FdTransport for compatibility
Properly document all constructor arguments of Transport
Allow the Transport class to be used for non-master nodes
Don't define the set of all daemons twice
* stable-2.11
Fix capitalization of TestCase
Trigger renew-crypto on downgrade to 2.11
Conflicts:
Makefile.am
lib/ssconf.py
src/Ganeti/Constants.hs
src/Ganeti/Ssconf.hs
test/hs/shelltests/htools-hbal.test
Resolutions:
Makefile.am
keep all the Haskell test data files
lib/ssconf.py
keep the auto-generated list of valid keys from master
src/Ganeti/Constants.hs
merge the ssconf entry for ssh ports to the list of valid keys
src/Ganeti/Ssconf.hs
keep the generated list of constructors from master
test/hs/shelltests/htools-hbal.test
keep all tests
diff --cc Makefile.am
index e4e3665,e52d769..c7dbea5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1711,7 -1699,7 +1715,8 @@@ TEST_FILES =
test/data/htools/hbal-excl-tags.data \
test/data/htools/hbal-forth.data \
test/data/htools/hbal-location-1.data \
+ test/data/htools/hbal-location-exclusion.data \
+ test/data/htools/hbal-location-2.data \
test/data/htools/hbal-migration-1.data \
test/data/htools/hbal-migration-2.data \
test/data/htools/hbal-migration-3.data \
diff --cc src/Ganeti/Constants.hs
index 3482a3b,fb5aa28..da5233f
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@@ -3907,40 -3896,9 +3908,44 @@@ ssFilePerms = 0o44
ssEnabledUserShutdown :: String
ssEnabledUserShutdown = "enabled_user_shutdown"
+ ssSshPorts :: String
+ ssSshPorts = "ssh_ports"
+
+validSsKeys :: FrozenSet String
+validSsKeys = ConstantUtils.mkSet
+ [ ssClusterName
+ , ssClusterTags
+ , ssFileStorageDir
+ , ssSharedFileStorageDir
+ , ssGlusterStorageDir
+ , ssMasterCandidates
+ , ssMasterCandidatesIps
+ , ssMasterCandidatesCerts
+ , ssMasterIp
+ , ssMasterNetdev
+ , ssMasterNetmask
+ , ssMasterNode
+ , ssNodeList
+ , ssNodePrimaryIps
+ , ssNodeSecondaryIps
+ , ssNodeVmCapable
+ , ssOfflineNodes
+ , ssOnlineNodes
+ , ssPrimaryIpFamily
+ , ssInstanceList
+ , ssReleaseVersion
+ , ssHypervisorList
+ , ssMaintainNodeHealth
+ , ssUidPool
+ , ssNodegroups
+ , ssNetworks
+ , ssEnabledUserShutdown
++ , ssSshPorts
+ ]
+ <>
+ validSsHvparamsKeys
+
+
-- | Cluster wide default parameters
defaultEnabledHypervisor :: String
defaultEnabledHypervisor = htXenPvm
