From: davidplunkett <dp7642@att.com>
Date: Thu, 23 May 2019 06:44:03 +0000 (+0000)
Subject: update input yaml paths in neutron template
X-Git-Tag: 1.0.0~13
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=e4badf20adc1fa69d3c780ebfb19e85f0887ee5d;p=yaml_builds.git

update input yaml paths in neutron template

fix neutron template for input file change from
  sriovnets:
to
  sriov:
    nets:

Signed-off-by: davidplunkett <dp7642@att.com>
Change-Id: I8ce1a271fde34062e18933f54ca8bea7c9aec846
---

diff --git a/site_type/ovsdpdk/templates/software/charts/osh/openstack-compute-kit/neutron.j2 b/site_type/ovsdpdk/templates/software/charts/osh/openstack-compute-kit/neutron.j2
index 1657cb5..f18b53a 100644
--- a/site_type/ovsdpdk/templates/software/charts/osh/openstack-compute-kit/neutron.j2
+++ b/site_type/ovsdpdk/templates/software/charts/osh/openstack-compute-kit/neutron.j2
@@ -44,7 +44,7 @@ data:
         - sriov
       interface:
         sriov:
-{% for sriovnet in yaml.sriovnets %}
+{% for sriovnet in yaml.sriov.nets %}
           - device: {{sriovnet.interface}}
             num_vfs: 32
             promisc: false
@@ -60,7 +60,7 @@ data:
           sriov_nic:
             exclude_devices: null
             physical_device_mappings: ' 
-{%- for sriovnet in yaml.sriovnets -%}
+{%- for sriovnet in yaml.sriov.nets -%}
 {%- if loop.index > 1 -%}
 ,
 {%- endif -%}
@@ -71,7 +71,7 @@ data:
             mechanism_drivers: l2population,openvswitch,sriovnicswitch
           ml2_type_vlan:
             network_vlan_ranges: bond0:46:300
-{%- for sriovnet in yaml.sriovnets -%}
+{%- for sriovnet in yaml.sriov.nets -%}
 ,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
 {%- endfor %}
 
diff --git a/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2 b/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2
index 1657cb5..f18b53a 100644
--- a/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2
+++ b/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2
@@ -44,7 +44,7 @@ data:
         - sriov
       interface:
         sriov:
-{% for sriovnet in yaml.sriovnets %}
+{% for sriovnet in yaml.sriov.nets %}
           - device: {{sriovnet.interface}}
             num_vfs: 32
             promisc: false
@@ -60,7 +60,7 @@ data:
           sriov_nic:
             exclude_devices: null
             physical_device_mappings: ' 
-{%- for sriovnet in yaml.sriovnets -%}
+{%- for sriovnet in yaml.sriov.nets -%}
 {%- if loop.index > 1 -%}
 ,
 {%- endif -%}
@@ -71,7 +71,7 @@ data:
             mechanism_drivers: l2population,openvswitch,sriovnicswitch
           ml2_type_vlan:
             network_vlan_ranges: bond0:46:300
-{%- for sriovnet in yaml.sriovnets -%}
+{%- for sriovnet in yaml.sriov.nets -%}
 ,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
 {%- endfor %}