From a64fcd28935d843cc2fd8ef3ff70640e9cdf8f43 Mon Sep 17 00:00:00 2001 From: Brian 'Redbeard' Harrington Date: Tue, 20 May 2014 22:53:29 -0700 Subject: [PATCH] fix(docs) Clear description of update server changes TBD Pulling in @philips' changes from coreos/coreos-cloudinit#6 after trashing PR coreos/coreos-cloudinit#20. Cleanup of that PR was beyond my git-fu. cc @jonboulle --- Documentation/cloud-config.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/cloud-config.md b/Documentation/cloud-config.md index f2df54c..730e674 100644 --- a/Documentation/cloud-config.md +++ b/Documentation/cloud-config.md @@ -95,6 +95,8 @@ For more information on fleet configuration, see the [fleet documentation][fleet #### update +These fields will be written out to and replace `/etc/coreos/update.conf`. If only one of the parameters is given it will only overwrite the given field. + The `coreos.update.*` parameters manipulate settings related to how CoreOS instances are updated. - **reboot-strategy**: One of "reboot", "etcd-lock", "best-effort" or "off" for controlling when reboots are issued after an update is performed. @@ -102,6 +104,8 @@ The `coreos.update.*` parameters manipulate settings related to how CoreOS insta - _etcd-lock_: Reboot after first taking a distributed lock in etcd, this guarantees that only one host will reboot concurrently and that the cluster will remain available during the update. - _best-effort_ - If etcd is running, "etcd-lock", otherwise simply "reboot". - _off_ - Disable rebooting after updates are applied (not recommended). +- **server**: is the omaha endpoint URL which will be queried for updates. +- **group**: signifies the channel which should be used for automatic updates. This value defaults to the version of the image initially downloaded. (one of "master", "alpha", "beta", "stable") ``` #cloud-config