From 2a4fc70e1cc4ad2abbe6beaf370bfb2bbd6727ae Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Mon, 28 May 2018 11:11:18 +0200
Subject: [PATCH] contiv-etcd-init image as default instead hardcoded
---
roles/network_plugin/contiv/defaults/main.yml | 3 +++
roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/roles/network_plugin/contiv/defaults/main.yml b/roles/network_plugin/contiv/defaults/main.yml
index b6e237df5..11c6e79a9 100644
--- a/roles/network_plugin/contiv/defaults/main.yml
+++ b/roles/network_plugin/contiv/defaults/main.yml
@@ -15,6 +15,9 @@ contiv_etcd_endpoints: |-
contiv_etcd{{ loop.index }}=http://{{ hostvars[host]['ip'] | default(hostvars[host].ansible_default_ipv4['address']) }}:{{ contiv_etcd_peer_port }}{% if not loop.last %},{% endif %}
{%- endfor %}
+contiv_etcd_init_image_repo: ferest/etcd-initer
+contiv_etcd_init_image_tag: latest
+
# Parameters for Contiv api-proxy
contiv_enable_api_proxy: true
contiv_api_proxy_port: 10000
diff --git a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2 b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
index a6e9121d4..9d7502857 100644
--- a/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
@@ -26,7 +26,7 @@ spec:
effect: NoSchedule
initContainers:
- name: contiv-etcd-init
- image: ferest/etcd-initer:latest
+ image: {{ contiv_etcd_init_image_repo }}:{{ contiv_etcd_init_image_tag }}
imagePullPolicy: Always
env:
- name: ETCD_INIT_ARGSFILE
--
GitLab