From 7dc58be1956b30edd5a8bcfc341e5bb24c545d50 Mon Sep 17 00:00:00 2001
From: Sam Irvine <s-irvine@users.noreply.github.com>
Date: Wed, 5 Aug 2020 15:34:59 +0100
Subject: [PATCH] fix: enable docker service for goss tests

---
 .../modules/AWS/Bastion/cloud-config.yaml     |  7 ++--
 .../AWS/Kubernetes/master-cloud-config.yaml   |  1 +
 .../AWS/Kubernetes/node-cloud-config.yaml     | 41 ++++++++++---------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/terraform/modules/AWS/Bastion/cloud-config.yaml b/terraform/modules/AWS/Bastion/cloud-config.yaml
index 29296440..d391e715 100644
--- a/terraform/modules/AWS/Bastion/cloud-config.yaml
+++ b/terraform/modules/AWS/Bastion/cloud-config.yaml
@@ -9,21 +9,22 @@ packages: ["docker.io", "figlet"]
 hostname: "bastion"
 
 runcmd:
+  - "systemctl enable docker"
   - "systemctl daemon-reload"
   - "systemctl restart docker"
   - "docker pull ${attack_container_repo}:${attack_container_tag}"
 
 write_files:
   - path: /etc/bash.bashrc
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${bastion_bashrc}
   - path: /home/ubuntu/.inputrc
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${bastion_inputrc}
   - path: /home/ubuntu/.bash_aliases
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${bastion_aliases}
   - path: /home/ubuntu/.bash_login
diff --git a/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml b/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
index ff6496f8..51abbdb6 100644
--- a/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
+++ b/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
@@ -55,6 +55,7 @@ runcmd:
   - 'tar -C /usr/bin -xzf /run/download/crictl.tgz'
   - 'chmod 754 /usr/bin/crictl'
   - 'chown root:root /usr/bin/crictl'
+  - 'systemctl enable docker'
   - 'systemctl daemon-reload'
   - 'systemctl restart docker'
   - 'systemctl restart kubelet'
diff --git a/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml b/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
index 52242b1e..081665f6 100644
--- a/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
+++ b/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
@@ -4,30 +4,30 @@ package_update: true
 package_upgrade: true
 disable_root: false
 
-packages: ['figlet']
+packages: ["figlet"]
 hostname: "${hostname}"
 
 write_files:
   - path: /etc/bash.bashrc
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${node_bashrc}
   - path: /root/.inputrc
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${node_inputrc}
   - path: /root/.bash_aliases
-    permissions: '0755'
+    permissions: "0755"
     content: !!binary |
       ${node_aliases}
   - path: /etc/default/motd-news
     owner: root:root
-    permissions: '0644'
+    permissions: "0644"
     content: |
       ENABLED=0
   - path: /etc/pam.d/sshd
     owner: root:root
-    permissions: '0644'
+    permissions: "0644"
     content: |
       # Defaults with comments removed and motd disabled
       @include common-auth
@@ -45,20 +45,21 @@ write_files:
       @include common-password
 
 runcmd:
-  - 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
+  - "curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -"
   - 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main"  > /etc/apt/sources.list.d/kubernetes.list'
-  - 'mkdir /run/download'
-  - 'apt update'
-  - 'apt install -y kubelet kubeadm kubectl docker.io awscli'
-  - 'wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz'
-  - 'tar -C /usr/bin -xzf /run/download/crictl.tgz'
-  - 'rm -rf /run/download'
-  - 'chmod 754 /usr/bin/crictl'
-  - 'chown root:root /usr/bin/crictl'
-  - 'systemctl daemon-reload'
-  - 'systemctl restart docker'
-  - 'systemctl restart kubelet'
-  - 'while true; do aws s3 ls s3://${s3_bucket_name}/join.txt > /dev/null; if [ $? -ne 0 ]; then sleep 10; else break; fi; done && aws s3 cp s3://${s3_bucket_name}/join.txt /tmp  && sh /tmp/join.txt'
+  - "mkdir /run/download"
+  - "apt update"
+  - "apt install -y kubelet kubeadm kubectl docker.io awscli"
+  - "wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz"
+  - "tar -C /usr/bin -xzf /run/download/crictl.tgz"
+  - "rm -rf /run/download"
+  - "chmod 754 /usr/bin/crictl"
+  - "chown root:root /usr/bin/crictl"
+  - "systemctl enable docker"
+  - "systemctl daemon-reload"
+  - "systemctl restart docker"
+  - "systemctl restart kubelet"
+  - "while true; do aws s3 ls s3://${s3_bucket_name}/join.txt > /dev/null; if [ $? -ne 0 ]; then sleep 10; else break; fi; done && aws s3 cp s3://${s3_bucket_name}/join.txt /tmp  && sh /tmp/join.txt"
 
 output:
-  all: '| tee -a /var/log/cloud-init-output.log'
+  all: "| tee -a /var/log/cloud-init-output.log"