From b92404fd0a9696e1797a448917a442b418955cbb Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Sat, 27 Aug 2016 15:08:25 +0400
Subject: [PATCH] Enable customization of calico-node docker image
New vars: calico_node_image_repo and claico_node_image_tag
Defaults: calico/node and {{ calico_version }}, respectively
---
roles/network_plugin/calico/defaults/main.yml | 4 ++++
roles/network_plugin/calico/templates/calico-node.service.j2 | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 8d0759ffb..0f59b21d5 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -7,9 +7,13 @@ ipip: false
# cloud_provider can only be set to 'gce' or 'aws'
# cloud_provider:
+
calicoctl_image_repo: calico/ctl
calicoctl_image_tag: "{{ calico_version }}"
+calico_node_image_repo: calico/node
+calico_node_image_tag: "{{ calico_version }}"
+
# Set to true if your Hyperkube has all required components to run
# calico. This is required in order to run canalized calico.
use_hyperkube_cni: false
diff --git a/roles/network_plugin/calico/templates/calico-node.service.j2 b/roles/network_plugin/calico/templates/calico-node.service.j2
index cd4f28679..a7f7e4bab 100644
--- a/roles/network_plugin/calico/templates/calico-node.service.j2
+++ b/roles/network_plugin/calico/templates/calico-node.service.j2
@@ -8,9 +8,9 @@ Wants=docker.socket etcd-proxy.service
User=root
PermissionsStartOnly=true
{% if inventory_hostname in groups['kube-node'] and peer_with_router|default(false)%}
-ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=false
+ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --as={{ local_as }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
{% else %}
-ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false
+ExecStart={{ bin_dir }}/calicoctl node --ip={{ip | default(ansible_default_ipv4.address) }} --detach=false --node-image={{ calico_node_image_repo }}:{{ calico_node_image_tag }}
{% endif %}
Restart=always
RestartSec=10s
--
GitLab