diff --git a/prepare-vms/settings/enix.yaml b/prepare-vms/settings/enix.yaml index be174893..adbe8efb 100644 --- a/prepare-vms/settings/enix.yaml +++ b/prepare-vms/settings/enix.yaml @@ -1,5 +1,5 @@ # Number of VMs per cluster -clustersize: 5 +clustersize: 1 # Jinja2 template to use to generate ready-to-cut cards cards_template: enix.html @@ -18,8 +18,9 @@ paper_margin: 0.2in engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.22.0 +compose_version: 1.21.1 machine_version: 0.14.0 # Password used to connect with the "docker user" docker_user_password: training + diff --git a/prepare-vms/settings/jerome.yaml b/prepare-vms/settings/jerome.yaml index 4445f7ca..3110dd55 100644 --- a/prepare-vms/settings/jerome.yaml +++ b/prepare-vms/settings/jerome.yaml @@ -5,7 +5,7 @@ clustersize: 4 cards_template: jerome.html # Use "Letter" in the US, and "A4" everywhere else -paper_size: Letter +paper_size: A4 # Feel free to reduce this if your printer can handle it paper_margin: 0.2in @@ -23,3 +23,4 @@ machine_version: 0.14.0 # Password used to connect with the "docker user" docker_user_password: training + diff --git a/prepare-vms/settings/kube101.yaml b/prepare-vms/settings/kube101.yaml index 8ae69278..8da41533 100644 --- a/prepare-vms/settings/kube101.yaml +++ b/prepare-vms/settings/kube101.yaml @@ -24,4 +24,5 @@ compose_version: 1.21.1 machine_version: 0.14.0 # Password used to connect with the "docker user" -docker_user_password: training \ No newline at end of file +docker_user_password: training + diff --git a/prepare-vms/templates/enix.html b/prepare-vms/templates/enix.html index 29b322c4..e84c0d7c 100644 --- a/prepare-vms/templates/enix.html +++ b/prepare-vms/templates/enix.html @@ -1,17 +1,17 @@ {# Feel free to customize or override anything in there! #} -{%- set url = "http://septembre2018.container.training" -%} +{%- set url = "http://FIXME.container.training" -%} {%- set pagesize = 9 -%} {%- if clustersize == 1 -%} {%- set workshop_name = "Docker workshop" -%} - {%- set cluster_or_machine = "machine" -%} - {%- set this_or_each = "this" -%} - {%- set machine_is_or_machines_are = "machine is" -%} + {%- set cluster_or_machine = "machine virtuelle" -%} + {%- set this_or_each = "cette" -%} + {%- set plural = "" -%} {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} {%- else -%} {%- set workshop_name = "Kubernetes workshop" -%} {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "each" -%} - {%- set machine_is_or_machines_are = "machines are" -%} + {%- set this_or_each = "chaque" -%} + {%- set plural = "s" -%} {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%} {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%} {%- set image_src = image_src_kube -%} @@ -19,11 +19,14 @@