From: Krisztian Lengyel <krisztian.lengyel@nokia.com>
Date: Thu, 8 Aug 2019 07:42:20 +0000 (+0200)
Subject: Fix handling of missing tenant_networks
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=commitdiff_plain;h=31349430c54e4ce1f649376614e4b09738954d5d

Fix handling of missing tenant_networks

Change-Id: I2c4d371c3a70f6a62bf87b0b8ea3876a76716cb2
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>
---

diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec
index 45ae133..b0a5560 100644
--- a/SPECS/caas-danm.spec
+++ b/SPECS/caas-danm.spec
@@ -15,7 +15,7 @@
 %define COMPONENT danm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.0.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define DANM_VERSION v%{RPM_MAJOR_VERSION}
 %define CNI_VERSION 0.7.0
 %define go_version 1.12.1
diff --git a/ansible/roles/danm_setup/templates/danm_tenant_config.yaml.j2 b/ansible/roles/danm_setup/templates/danm_tenant_config.yaml.j2
index 1a2b6a1..97f8888 100644
--- a/ansible/roles/danm_setup/templates/danm_tenant_config.yaml.j2
+++ b/ansible/roles/danm_setup/templates/danm_tenant_config.yaml.j2
@@ -44,7 +44,7 @@ hostDevices:
     {% set profile = network_profiles[profile_name] %}
     {% set caas_provider_networks = profile.get('provider_network_interfaces', {}) | filter_provider_networks_by_type('caas') %}
     {% set caas_sriov_provider_networks = profile.get('sriov_provider_networks', {}) | filter_provider_networks_by_type('caas') %}
-    {% for tenant_network in caas.get(tenant_networks, []) %}
+    {% for tenant_network in caas.get('tenant_networks', []) %}
       {% if tenant_network in caas_provider_networks | get_provider_networks %}
   {{ make_host_devices(caas_provider_networks.keys(), networking['provider_networks'][tenant_network]) | indent(2) -}}
       {% elif tenant_network in caas_sriov_provider_networks %}