• Helga Velroyen's avatar
    Merge branch 'stable-2.12' into stable-2.13 · 7f1ac87a
    Helga Velroyen authored
    * stable-2.12
      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
    
    Conflicts:
      Makefile.am
      NEWS
      UPGRADE
      lib/client/gnt_cluster.py
      lib/cmdlib/cluster.py
      lib/tools/common.py
      lib/tools/prepare_node_join.py
      lib/watcher/__init__.py
      man/ganeti-watcher.rst
      src/Ganeti/OpCodes.hs
      test/hs/Test/Ganeti/OpCodes.hs
      test/py/cmdlib/cluster_unittest.py
      test/py/ganeti.tools.prepare_node_join_unittest.py
      tools/cfgupgrade
    
    Resolutions:
      Makefile.am:
        add ssl_update and ssh_update
      NEWS:
        add new sections from 2.12 and 2.13
      UPGRADE:
        add notes for both 2.12 and 2.13
      lib/client/gnt_cluster.py:
        add all new options to RenewCluster, remove version-specific
        downgrade code
      lib/tools/common.py:
        split the two mismatching versions of _VerifyCertificate
        and VerifyCertificate up into [_]VerifyCertifcate{Soft,Strong}
        and update usages accordingly
      lib/tools/prepare_node_join.py
        update usage of correct VerifyCertificate function
      lib/watcher/__init__.py
        add both new options, --rapi-ip and --no-verify-disks
      man/ganeti-watcher.rst
        update docs for both new options (see above)
      src/Ganeti/OpCodes.hs
        add all new options to OpRenewCrypto
      test/hs/Test/Ganeti/OpCodes.hs
        add enough 'arbitrary' for all new options of OpRenewCrypto
      test/py/cmdlib/cluster_unittest.py
        use changes from 2.12
      test/py/ganeti.tools.prepare_node_join_unittest.py
        remove tests that were moved to common_unittest.py
      tools/cfgupgrade
        use only downgrade code of 2.13
    Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    7f1ac87a
Name
Last commit
Last update
..
css Loading commit data...
examples Loading commit data...
users Loading commit data...
admin.rst Loading commit data...
cluster-keys-replacement.rst Loading commit data...
cluster-merge.rst Loading commit data...
conf.py Loading commit data...
design-2.0.rst Loading commit data...
design-2.1.rst Loading commit data...
design-2.10.rst Loading commit data...
design-2.11.rst Loading commit data...
design-2.12.rst Loading commit data...
design-2.13.rst Loading commit data...
design-2.2.rst Loading commit data...
design-2.3.rst Loading commit data...
design-2.4.rst Loading commit data...
design-2.5.rst Loading commit data...
design-2.6.rst Loading commit data...
design-2.7.rst Loading commit data...
design-2.8.rst Loading commit data...
design-2.9.rst Loading commit data...
design-autorepair.rst Loading commit data...
design-bulk-create.rst Loading commit data...
design-ceph-ganeti-support.rst Loading commit data...
design-chained-jobs.rst Loading commit data...
design-cmdlib-unittests.rst Loading commit data...
design-configlock.rst Loading commit data...
design-cpu-pinning.rst Loading commit data...
design-cpu-speed.rst Loading commit data...
design-daemons.rst Loading commit data...
design-device-uuid-name.rst Loading commit data...
design-disk-conversion.rst Loading commit data...
design-disks.rst Loading commit data...
design-draft.rst Loading commit data...
design-file-based-storage.rst Loading commit data...
design-glusterfs-ganeti-support.rst Loading commit data...
design-hotplug.rst Loading commit data...
design-hroller.rst Loading commit data...
design-hsqueeze.rst Loading commit data...
design-htools-2.3.rst Loading commit data...
design-http-server.rst Loading commit data...
design-hugepages-support.rst Loading commit data...
design-ifdown.rst Loading commit data...
design-impexp2.rst Loading commit data...
design-internal-shutdown.rst Loading commit data...
design-kvmd.rst Loading commit data...
design-linuxha.rst Loading commit data...
design-location.rst Loading commit data...
design-lu-generated-jobs.rst Loading commit data...
design-monitoring-agent.rst Loading commit data...
design-move-instance-improvements.rst Loading commit data...
design-multi-reloc.rst Loading commit data...
design-multi-version-tests.rst Loading commit data...
design-network.rst Loading commit data...
design-network2.rst Loading commit data...
design-node-add.rst Loading commit data...
design-node-security.rst Loading commit data...
design-oob.rst Loading commit data...
design-openvswitch.rst Loading commit data...
design-opportunistic-locking.rst Loading commit data...
design-optables.rst Loading commit data...
design-os.rst Loading commit data...
design-ovf-support.rst Loading commit data...
design-partitioned.rst Loading commit data...
design-performance-tests.rst Loading commit data...
design-query-splitting.rst Loading commit data...
design-query2.rst Loading commit data...
design-reason-trail.rst Loading commit data...
design-reservations.rst Loading commit data...
design-resource-model.rst Loading commit data...
design-restricted-commands.rst Loading commit data...
design-shared-storage.rst Loading commit data...
design-ssh-ports.rst Loading commit data...
design-storagetypes.rst Loading commit data...
design-sync-rate-throttling.rst Loading commit data...
design-systemd.rst Loading commit data...
design-upgrade.rst Loading commit data...
design-virtual-clusters.rst Loading commit data...
design-x509-ca.rst Loading commit data...
dev-codestyle.rst Loading commit data...
devnotes.rst Loading commit data...
glossary.rst Loading commit data...
hooks.rst Loading commit data...
iallocator.rst Loading commit data...
index.rst Loading commit data...
install.rst Loading commit data...
locking.rst Loading commit data...
manpages-disabled.rst Loading commit data...
monitoring-query-format.rst Loading commit data...
move-instance.rst Loading commit data...
ovfconverter.rst Loading commit data...
rapi.rst Loading commit data...
security.rst Loading commit data...
virtual-cluster.rst Loading commit data...
walkthrough.rst Loading commit data...