From 88f782c60dc2f24024d599b666f772c494965d25 Mon Sep 17 00:00:00 2001 From: David Young Date: Wed, 3 Jun 2020 15:17:28 +1200 Subject: [PATCH] Tidy up gluster --- manuscript/book.txt | 76 +------------------ .../ha-docker-swarm/shared-storage-ceph.md | 10 +-- .../ha-docker-swarm/shared-storage-gluster.md | 3 + scripts/markdown-to-markua.sh | 3 + 4 files changed, 12 insertions(+), 80 deletions(-) diff --git a/manuscript/book.txt b/manuscript/book.txt index 8988ec8..46e92c2 100644 --- a/manuscript/book.txt +++ b/manuscript/book.txt @@ -7,78 +7,4 @@ sections/ha-docker-swarm.md ha-docker-swarm/design.md ha-docker-swarm/nodes.md ha-docker-swarm/shared-storage-ceph.md -ha-docker-swarm/shared-storage-gluster.md -ha-docker-swarm/keepalived.md -ha-docker-swarm/docker-swarm-mode.md -ha-docker-swarm/traefik.md -ha-docker-swarm/traefik-forward-auth.md -ha-docker-swarm/traefik-forward-auth/keycloak.md -ha-docker-swarm/registry.md - -sections/chefs-favorites-docker.md -recipes/autopirate.md -recipes/autopirate/sabnzbd.md -recipes/autopirate/nzbget.md -recipes/autopirate/rtorrent.md -recipes/autopirate/sonarr.md -recipes/autopirate/radarr.md -recipes/autopirate/mylar.md -recipes/autopirate/lazylibrarian.md -recipes/autopirate/headphones.md -recipes/autopirate/lidarr.md -recipes/autopirate/nzbhydra.md -recipes/autopirate/nzbhydra2.md -recipes/autopirate/ombi.md -recipes/autopirate/jackett.md -recipes/autopirate/heimdall.md -recipes/autopirate/end.md - -recipes/duplicity.md -recipes/elkarbackup.md -recipes/emby.md -recipes/homeassistant.md -recipes/homeassistant/ibeacon.md -recipes/huginn.md -recipes/kanboard.md -recipes/miniflux.md -recipes/munin.md -recipes/nextcloud.md -recipes/owntracks.md -recipes/phpipam.md -recipes/plex.md -recipes/privatebin.md -recipes/swarmprom.md - -sections/menu-docker.md -recipes/bitwarden.md -recipes/bookstack.md -recipes/calibre-web.md -recipes/collabora-online.md -recipes/ghost.md -recipes/gitlab.md -recipes/gitlab-runner.md -recipes/gollum.md -recipes/instapy.md -recipes/keycloak.md -recipes/keycloak/create-user.md -recipes/keycloak/authenticate-against-openldap.md -recipes/keycloak/setup-oidc-provider.md -recipes/openldap.md -recipes/mail.md -recipes/minio.md -recipes/piwik.md -recipes/portainer.md -recipes/realms.md -recipes/tiny-tiny-rss.md -recipes/wallabag.md -recipes/wekan.md -recipes/wetty.md - -sections/reference.md -reference/oauth_proxy.md -reference/data_layout.md -reference/networks.md -reference/containers.md -reference/git-docker.md -reference/openvpn.md -reference/troubleshooting.md +ha-docker-swarm/shared-storage-gluster.md \ No newline at end of file diff --git a/manuscript/ha-docker-swarm/shared-storage-ceph.md b/manuscript/ha-docker-swarm/shared-storage-ceph.md index cf7485f..6ebd858 100644 --- a/manuscript/ha-docker-swarm/shared-storage-ceph.md +++ b/manuscript/ha-docker-swarm/shared-storage-ceph.md @@ -133,11 +133,11 @@ The process takes about 30 seconds, after which, you'll have a MVC (*Minimum Via It's now necessary to tranfer the following files to your ==other== nodes, so that cephadm can add them to your cluster, and so that they'll be able to mount the cephfs when we're done: -Path on master | Path on non-master ---------------- | ----- -`/etc/ceph/ceph.conf` | `/etc/ceph/ceph.conf` -`/etc/ceph/ceph.client.admin.keyring` | `/etc/ceph/ceph.client.admin.keyring` -`/etc/ceph/ceph.pub` | `/root/.ssh/authorized_keys` (append to anything existing) +| Path on master | Path on non-master | +|---------------------------------------|------------------------------------------------------------| +| `/etc/ceph/ceph.conf` | `/etc/ceph/ceph.conf` | +| `/etc/ceph/ceph.client.admin.keyring` | `/etc/ceph/ceph.client.admin.keyring` | +| `/etc/ceph/ceph.pub` | `/root/.ssh/authorized_keys` (append to anything existing) | Back on the ==master== node, run `ceph orch host add ` once for each other node you want to join to the cluster. You can validate the results by running `ceph orch host ls` diff --git a/manuscript/ha-docker-swarm/shared-storage-gluster.md b/manuscript/ha-docker-swarm/shared-storage-gluster.md index 1cb2f20..e5aa241 100644 --- a/manuscript/ha-docker-swarm/shared-storage-gluster.md +++ b/manuscript/ha-docker-swarm/shared-storage-gluster.md @@ -31,6 +31,7 @@ To build our Gluster volume, we need 2 out of the 3 VMs to provide one "brick". On each host, run a variation following to create your bricks, adjusted for the path to your disk. !!! note "The example below assumes /dev/vdb is dedicated to the gluster volume" + ``` ( echo o # Create a new empty DOS partition table @@ -58,6 +59,7 @@ mount -a && mount Atomic doesn't include the Gluster server components. This means we'll have to run glusterd from within a container, with privileged access to the host. Although convoluted, I've come to prefer this design since it once again makes the OS "disposable", moving all the config into containers and code. Run the following on each host: + ```` docker run \ -h glusterfs-server \ @@ -71,6 +73,7 @@ docker run \ --name="glusterfs-server" \ gluster/gluster-centos ```` + ### Create trusted pool On a single node (doesn't matter which), run ```docker exec -it glusterfs-server bash``` to launch a shell inside the container. diff --git a/scripts/markdown-to-markua.sh b/scripts/markdown-to-markua.sh index 4274863..2b954ca 100755 --- a/scripts/markdown-to-markua.sh +++ b/scripts/markdown-to-markua.sh @@ -16,6 +16,9 @@ do # Animated gifs make leanpub fail, so strip 'em out by deleting the entire line sed -i '/.gif/d' $file + # Strip out mkdocs admonitions + sed -i '/\!\!\!/d' $file + # strip emojis tr -cd '\11\12\15\40-\176' < $file > $file-clean mv $file-clean $file