From b53e3f84df1a02b1c17d785cae37057d7fe49cc9 Mon Sep 17 00:00:00 2001
From: Julien Girardin <julien.girardin@enix.fr>
Date: Mon, 13 Jan 2020 17:29:02 +0100
Subject: [PATCH] Changes for Caen University (France)

---
 prepare-vms/Dockerfile                 | 19 +++++++++++++++++--
 prepare-vms/docker-compose.yml         |  4 +++-
 prepare-vms/lib/commands.sh            | 12 ++++++++++++
 prepare-vms/settings/fundamentals.yaml |  4 +++-
 prepare-vms/terraform/machines.tf      |  2 +-
 prepare-vms/terraform/provider.tf      | 20 ++++++++++----------
 6 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/prepare-vms/Dockerfile b/prepare-vms/Dockerfile
index 8a062f08..720db65f 100644
--- a/prepare-vms/Dockerfile
+++ b/prepare-vms/Dockerfile
@@ -8,11 +8,14 @@ RUN apt-get update && apt-get install -y \
     groff \
     jq \
     less \
+    locales \
     man \
     pssh \
     python \
+    python3 \
     python-docutils \
     python-pip \
+    python3-pip \
     ssh \
     unzip \
     wkhtmltopdf \
@@ -20,6 +23,14 @@ RUN apt-get update && apt-get install -y \
     --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
+# Set the locale
+RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_GB.UTF-8
+
+ENV LANG en_GB.UTF-8
+ENV LC_ALL en_GB.UTF-8
+
 ARG TERRAFORM_VERSION=0.11.13
 RUN curl -s https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
     -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
@@ -28,12 +39,16 @@ RUN curl -s https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf
  && rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 
 
-RUN pip install \
+RUN pip install -U \
     awscli \
     jinja2 \
     pdfkit \
     PyYAML \
-    termcolor
+    termcolor \
+ && pip3 install -U \
+    jinja2 \
+    pdfkit \
+    PyYAML
 
 RUN mv $(which wkhtmltopdf) $(which wkhtmltopdf).real
 COPY lib/wkhtmltopdf /usr/local/bin/wkhtmltopdf
diff --git a/prepare-vms/docker-compose.yml b/prepare-vms/docker-compose.yml
index d90b4367..3a81ba6c 100644
--- a/prepare-vms/docker-compose.yml
+++ b/prepare-vms/docker-compose.yml
@@ -7,6 +7,8 @@ services:
         working_dir: /root/prepare-vms
         volumes:
             - $HOME/.aws/:/root/.aws/
+            - $HOME/.ssh/:/root/.ssh/
+            - $HOME/.config/openstack:/root/.config/openstack
             - $SSH_AUTH_SOCK:$SSH_AUTH_SOCK
             - $PWD/:/root/prepare-vms/
         environment:
@@ -16,4 +18,4 @@ services:
             AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
             AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
             USER: ${USER}
-        entrypoint: /root/prepare-vms/workshopctl
+#        entrypoint: /root/prepare-vms/workshopctl
diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh
index ade36b6e..4334fabc 100644
--- a/prepare-vms/lib/commands.sh
+++ b/prepare-vms/lib/commands.sh
@@ -264,6 +264,18 @@ EOF"
     sep "Done"
 }
 
+_cmd minikube "Install kind to optionnaly transform a docker machine in a small kube cluster"
+_cmd_minikube() {
+    TAG=$1
+    need_tag
+
+    pssh --timeout 200 "
+    sudo curl -L https://github.com/kubernetes/minikube/releases/download/v1.6.2/minikube-linux-amd64 -o /usr/local/bin/minikube
+    sudo chmod +x /usr/local/bin/minikube
+    sudo minikube config set vm-driver none
+    "
+}
+
 _cmd kubereset "Wipe out Kubernetes configuration on all nodes"
 _cmd_kubereset() {
     TAG=$1
diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/fundamentals.yaml
index 6c04c682..e5d9a41d 100644
--- a/prepare-vms/settings/fundamentals.yaml
+++ b/prepare-vms/settings/fundamentals.yaml
@@ -27,4 +27,6 @@ compose_version: 1.24.1
 machine_version: 0.15.0
 
 # Password used to connect with the "docker user"
-docker_user_password: training
+docker_user_password: Unicaen
+
+url: https://intro-2019-12.container.training/
diff --git a/prepare-vms/terraform/machines.tf b/prepare-vms/terraform/machines.tf
index 41ff96e7..9bd6ce28 100644
--- a/prepare-vms/terraform/machines.tf
+++ b/prepare-vms/terraform/machines.tf
@@ -1,5 +1,5 @@
 resource "openstack_compute_instance_v2" "machine" {
-  count           = "${var.count}" 
+  count           = "${var.count}"
   name            = "${format("%s-%04d", "${var.prefix}", count.index+1)}"
   image_name      = "Ubuntu 16.04.5 (Xenial Xerus)"
   flavor_name     = "${var.flavor}"
diff --git a/prepare-vms/terraform/provider.tf b/prepare-vms/terraform/provider.tf
index 9e71bd53..56ba3d9d 100644
--- a/prepare-vms/terraform/provider.tf
+++ b/prepare-vms/terraform/provider.tf
@@ -1,13 +1,13 @@
 provider "openstack" {
-  user_name   = "${var.user}"
-  tenant_name = "${var.tenant}"
-  domain_name = "${var.domain}"
-  password    = "${var.password}"
-  auth_url    = "${var.auth_url}"
+  #  user_name   = "${var.user}"
+  #  tenant_name = "${var.tenant}"
+  #  domain_name = "${var.domain}"
+  #  password    = "${var.password}"
+  #  auth_url    = "${var.auth_url}"
 }
 
-variable "user" {}
-variable "tenant" {}
-variable "domain" {}
-variable "password" {}
-variable "auth_url" {}
+#variable "user" {}
+#variable "tenant" {}
+#variable "domain" {}
+#variable "password" {}
+#variable "auth_url" {}