From 3ff8b3717788ebd74ee7a5e0e07fa13640648603 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Sirot <jcsirot@gmail.com>
Date: Sat, 16 Apr 2016 19:01:31 +0200
Subject: [PATCH] Minor modifications for the DevoxxFR lab

---
 inventory/group_vars/all.yml                           | 2 +-
 roles/dnsmasq/templates/dnsmasq-ds.yml                 | 2 +-
 roles/download/tasks/main.yml                          | 1 +
 roles/kubernetes/preinstall/tasks/main.yml             | 4 ++--
 roles/network_plugin/flannel/templates/flannel-pod.yml | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 5ed2035a9..2db2d216a 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -3,7 +3,7 @@ bin_dir: /usr/local/bin
 
 # Where the binaries will be downloaded.
 # Note: ensure that you've enough disk space (about 1G)
-local_release_dir: "/tmp/releases"
+local_release_dir: "/opt/binaries/releases"
 
 # Uncomment this line for CoreOS only.
 # Directory where python binary is installed
diff --git a/roles/dnsmasq/templates/dnsmasq-ds.yml b/roles/dnsmasq/templates/dnsmasq-ds.yml
index 44c046f18..fb1654b34 100644
--- a/roles/dnsmasq/templates/dnsmasq-ds.yml
+++ b/roles/dnsmasq/templates/dnsmasq-ds.yml
@@ -25,7 +25,7 @@ spec:
             capabilities:
               add:
                 - NET_ADMIN
-          imagePullPolicy: Always
+          imagePullPolicy: Never
           resources:
             limits:
               cpu: 100m
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 746be939e..43ebbc5a0 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -11,6 +11,7 @@
     owner: "{{ item.owner|default(omit) }}"
     mode: "{{ item.mode|default(omit) }}"
   with_items: "{{ downloads }}"
+  when: False
 
 - name: Extract archives
   unarchive:
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 952319c27..3a8248794 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -70,7 +70,7 @@
 
 - name: Install latest version of python-apt for Debian distribs
   apt: name=python-apt state=latest update_cache=yes cache_valid_time=3600
-  when: ansible_os_family == "Debian"
+  when: False # ansible_os_family == "Debian"
 
 - name: Install python-dnf for latest RedHat versions
   command: dnf install -y python-dnf yum
@@ -90,7 +90,7 @@
     name: "{{ item }}"
     state: latest
   with_items: "{{required_pkgs | default([]) | union(common_required_pkgs|default([]))}}"
-  when: ansible_os_family != "CoreOS"
+  when: False # ansible_os_family != "CoreOS"
 
 # Todo : selinux configuration
 - name: Set selinux policy to permissive
diff --git a/roles/network_plugin/flannel/templates/flannel-pod.yml b/roles/network_plugin/flannel/templates/flannel-pod.yml
index 36198e11a..b184dd113 100644
--- a/roles/network_plugin/flannel/templates/flannel-pod.yml
+++ b/roles/network_plugin/flannel/templates/flannel-pod.yml
@@ -25,7 +25,7 @@
         volumeMounts:
           - name: "networkconfig"
             mountPath: "/etc/flannel-network.json"
-        imagePullPolicy: "Always"
+        imagePullPolicy: "Never"
       - name: "flannel-container"
         image: "quay.io/coreos/flannel:0.5.5"
         command:
@@ -43,4 +43,5 @@
             mountPath: "/run/flannel"
         securityContext:
           privileged: true
+        imagePullPolicy: "Never"
     hostNetwork: true