From 20d77ffb61d539e7ba882fc4bd700c576ec4b715 Mon Sep 17 00:00:00 2001 From: David Young Date: Tue, 25 Jul 2017 22:44:11 +1200 Subject: [PATCH] Improve formatting and remove link to S3 storage --- docs/ha-docker-swarm/s3-storage.md | 0 docs/ha-docker-swarm/shared-storage.md | 13 +++++++------ docs/ha-docker-swarm/traefik.md | 2 +- docs/ha-docker-swarm/vms.md | 13 ++++++++----- mkdocs.yml | 1 - 5 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 docs/ha-docker-swarm/s3-storage.md diff --git a/docs/ha-docker-swarm/s3-storage.md b/docs/ha-docker-swarm/s3-storage.md deleted file mode 100644 index e69de29..0000000 diff --git a/docs/ha-docker-swarm/shared-storage.md b/docs/ha-docker-swarm/shared-storage.md index e4df27c..db215bf 100644 --- a/docs/ha-docker-swarm/shared-storage.md +++ b/docs/ha-docker-swarm/shared-storage.md @@ -143,15 +143,16 @@ For non-gluster nodes, you'll need to replace $MYHOST above with the name of one ## Serving -!!! summary "Ready to serve..." - After completing the above, you should have: +After completing the above, you should have: - * [X] Persistent storage available to every node - * [X] Resiliency in the event of the failure of a single (gluster) node +``` +[X] Persistent storage available to every node +[X] Resiliency in the event of the failure of a single (gluster) node +``` -## Sides +## Chef's Notes -Future enhancements to this recipe inculde: +Future enhancements to this recipe include: 1. Migration of shared storage from GlusterFS to Ceph ()[#2](https://gitlab.funkypenguin.co.nz/funkypenguin/geeks-cookbook/issues/2)) 2. Correct the fact that volumes don't automount on boot ([#3](https://gitlab.funkypenguin.co.nz/funkypenguin/geeks-cookbook/issues/3)) diff --git a/docs/ha-docker-swarm/traefik.md b/docs/ha-docker-swarm/traefik.md index 411ab43..3acb18d 100644 --- a/docs/ha-docker-swarm/traefik.md +++ b/docs/ha-docker-swarm/traefik.md @@ -137,7 +137,7 @@ You now have: 2. Automatic SSL support for all proxied resources -## Extra Toppings +## Chef's Notes Additional features I'd like to see in this recipe are: diff --git a/docs/ha-docker-swarm/vms.md b/docs/ha-docker-swarm/vms.md index 31dbd17..dcea5b4 100644 --- a/docs/ha-docker-swarm/vms.md +++ b/docs/ha-docker-swarm/vms.md @@ -33,7 +33,7 @@ I chose the "[Atomic](https://www.projectatomic.io/)" CentOS/Fedora image for th If you're not using a platform with cloud-init support (i.e., you're building a VM manually, not provisioning it through a cloud provider), you'll need to refer to [trick #1][atomic-trick1] and [#2][atomic-trick2] for a means to override the automated setup, apply a manual password to the CentOS account, and enable SSH password logins. -### Change to latest docker +### Prefer docker-latest Run the following on each node to replace the default docker 1.12 with docker 1.13 (_which we need for swarm mode_): ``` @@ -70,8 +70,11 @@ Depending on your hosting environment, you may have DNS automatically setup for ``` -!!! summary "Ready to serve..." - After completing the above, you should have: +## Serving - * [X] 3 fresh atomic instances, at the latest releases - * [X] Docker 1.13, with experimental features enabled +After completing the above, you should have: + +``` +[X] 3 x fresh atomic instances, at the latest releases, + running Docker v1.13 (docker-latest) +``` diff --git a/mkdocs.yml b/mkdocs.yml index 5544dab..3e460fd 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -24,7 +24,6 @@ pages: - Keepalived: ha-docker-swarm/keepalived.md - Docker Swarm Mode: ha-docker-swarm/docker-swarm-mode.md - Traefik: ha-docker-swarm/traefik.md - - S3-like Storage: ha-docker-swarm/s3-storage.md - Tiny Tiny RSS: - Basic: advanced/tiny-tiny-rss.md - Plugins: advanced/tiny-tiny-rss.md