From 719fedab6567a03d7b3fb8b2706c2c48edbd06f8 Mon Sep 17 00:00:00 2001 From: Balint Varga Date: Fri, 30 Aug 2019 13:23:05 +0200 Subject: [PATCH] Configurable flannel cidr introduction Change-Id: Ie65814207bf4b7c3cc0df81f04d5fb3e5e1182f0 Signed-off-by: Balint Varga --- SPECS/caas-flannel.spec | 2 +- ansible/roles/flannel/templates/flannel-cm.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec index d3de5a8..31273c2 100644 --- a/SPECS/caas-flannel.spec +++ b/SPECS/caas-flannel.spec @@ -15,7 +15,7 @@ %define COMPONENT flannel %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.11.0 -%define RPM_MINOR_VERSION 7 +%define RPM_MINOR_VERSION 8 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/ansible/roles/flannel/templates/flannel-cm.yaml b/ansible/roles/flannel/templates/flannel-cm.yaml index 840d093..367af85 100644 --- a/ansible/roles/flannel/templates/flannel-cm.yaml +++ b/ansible/roles/flannel/templates/flannel-cm.yaml @@ -25,7 +25,7 @@ metadata: data: net-conf.json: | { - "Network": "10.244.0.0/16", + "Network": "{{ caas.oam_cidr }}", "Backend": { "Type": "vxlan" } -- 2.16.6