diff --git a/prepare-vms/cards.html b/prepare-vms/cards.html index 1cf0260c..b30c0a99 100644 --- a/prepare-vms/cards.html +++ b/prepare-vms/cards.html @@ -1,20 +1,18 @@ {# Feel free to customize or override anything in there! #} -{%- set url = "http://container.training/" -%} +{%- set url = "avril2018.container.training" -%} {%- set pagesize = 12 -%} {%- 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 workshop_name = "formation" -%} + {%- set cluster_or_machine = "votre VM" -%} + {%- set machine_is_or_machines_are = "Votre VM" -%} {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%} {%- else -%} - {%- set workshop_name = "orchestration workshop" -%} - {%- set cluster_or_machine = "cluster" -%} - {%- set this_or_each = "each" -%} - {%- set machine_is_or_machines_are = "machines are" -%} + {%- set workshop_name = "formation" -%} + {%- set cluster_or_machine = "votre cluster" -%} + {%- set machine_is_or_machines_are = "Votre cluster" -%} {%- 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_swarm -%} + {%- set image_src = image_src_kube -%} {%- endif -%} @@ -75,9 +73,9 @@ img {

- Here is the connection information to your very own - {{ cluster_or_machine }} for this {{ workshop_name }}. - You can connect to {{ this_or_each }} VM with any SSH client. + Voici les informations pour vous connecter à + {{ cluster_or_machine }} pour cette formation. + Vous pouvez vous connecter avec n'importe quel client SSH.

@@ -90,14 +88,14 @@ img {

- Your {{ machine_is_or_machines_are }}: + {{ machine_is_or_machines_are }} : {% for node in cluster %} {% endfor %}
node{{ loop.index }}:{{ node }}

-

You can find the slides at: +

Les slides sont à l'adresse suivante :

{{ url }}

diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/fundamentals.yaml index f4029d05..29f78444 100644 --- a/prepare-vms/settings/fundamentals.yaml +++ b/prepare-vms/settings/fundamentals.yaml @@ -7,7 +7,7 @@ clustersize: 1 cards_template: cards.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 @@ -17,8 +17,8 @@ paper_margin: 0.2in # (The equivalent parameters must be set from the browser's print dialog.) # This can be "test" or "stable" -engine_version: test +engine_version: stable # These correspond to the version numbers visible on their respective GitHub release pages -compose_version: 1.17.1 -machine_version: 0.13.0 +compose_version: 1.20.1 +machine_version: 0.14.0 diff --git a/prepare-vms/settings/orchestration.yaml b/prepare-vms/settings/orchestration.yaml index 5d819606..c654150f 100644 --- a/prepare-vms/settings/orchestration.yaml +++ b/prepare-vms/settings/orchestration.yaml @@ -7,7 +7,7 @@ clustersize: 5 cards_template: cards.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