From 080c698ec2a82ce81b970248d13a1f2609da8b4f Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Fri, 6 Feb 2015 13:31:50 -0800 Subject: [PATCH 1/2] docs: link to CoreUpdate and Omaha --- Documentation/cloud-config.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/cloud-config.md b/Documentation/cloud-config.md index 21acc75..1b70c05 100644 --- a/Documentation/cloud-config.md +++ b/Documentation/cloud-config.md @@ -167,9 +167,12 @@ The `reboot-strategy` parameter also affects the behaviour of [locksmith](https: - _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. +- **server**: The location of the [CoreUpdate][coreupdate] server which will be queried for updates. Also known as the [omaha][omaha-docs] server endpoint. - **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") +[coreupdate]: {{site.url}}/products/coreupdate +[omaha-docs]: https://code.google.com/p/omaha/ + *Note: cloudinit will only manipulate the locksmith unit file in the systemd runtime directory (`/run/systemd/system/locksmithd.service`). If any manual modifications are made to an overriding unit configuration file (e.g. `/etc/systemd/system/locksmithd.service`), cloudinit will no longer be able to control the locksmith service unit.* ##### Example From a3357c273c17590899ecaca4bd25c157888b3cbf Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Fri, 6 Feb 2015 13:43:06 -0800 Subject: [PATCH 2/2] docs: update links --- Documentation/cloud-config.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/cloud-config.md b/Documentation/cloud-config.md index 1b70c05..c35f795 100644 --- a/Documentation/cloud-config.md +++ b/Documentation/cloud-config.md @@ -170,8 +170,8 @@ The `reboot-strategy` parameter also affects the behaviour of [locksmith](https: - **server**: The location of the [CoreUpdate][coreupdate] server which will be queried for updates. Also known as the [omaha][omaha-docs] server endpoint. - **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") -[coreupdate]: {{site.url}}/products/coreupdate -[omaha-docs]: https://code.google.com/p/omaha/ +[coreupdate]: https://coreos.com/products/coreupdate +[omaha-docs]: https://coreos.com/docs/coreupdate/custom-apps/coreupdate-protocol/ *Note: cloudinit will only manipulate the locksmith unit file in the systemd runtime directory (`/run/systemd/system/locksmithd.service`). If any manual modifications are made to an overriding unit configuration file (e.g. `/etc/systemd/system/locksmithd.service`), cloudinit will no longer be able to control the locksmith service unit.*