start on 17/18

Author: hjwp

chapter_11_ansible.asciidoc

@@ -642,6 +642,10 @@ In Ansible config, it looks like this:
 ----
 ====
 
+NOTE: Colima users on MacOS may need to set an env var to get the ansible-docker
+    integration to work in the "Export container image locally" stage:
+    `DOCKER_HOST=unix:///$HOME/.colima/default/docker.sock`
+
 // CSANAD: I would add `update_cache: true` to the `Install docker` task back,
 //         it's a good practice to update the apt cache before installing.
 //

chapter_17_second_deploy.asciidoc

@@ -2,8 +2,8 @@
 Deploying Our New Code
 ----------------------
 
-((("deployment", "procedure for", id="Dpro17")))It's
-time to deploy our brilliant new validation code to our live servers.
+((("deployment", "procedure for", id="Dpro17")))
+It's time to deploy our brilliant new validation code to our live servers.
 This will be a chance to see our automated deploy scripts in action for the
 second time.
 
@@ -35,9 +35,7 @@ We start with the staging server:
 [role="against-server"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*git push*]
-$ pass:quotes[*cd deploy_tools*]
-$ pass:quotes[*fab deploy:[email protected]*]
+$ pass:quotes[*ansible-playbook --user=elspeth -i staging.ottg.co.uk, infra/ansible-provision.yaml -vv*]
 [...]
 Disconnecting from staging.ottg.co.uk... done.
 ----