X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fneutron.j2;fp=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fneutron.j2;h=31a24bb2db108ff9ecfb1cf7bbf1a94125ee6110;hb=4f46211cc43745923628a68a93832bb93822af2c;hp=5af8e8cf59d94b2872a938cc0566410daae7850a;hpb=453d58c308e03511df2d51f7bac95b91e1789fbf;p=yaml_builds.git

diff --git a/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2 b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
index 5af8e8c..31a24bb 100644
--- a/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
+++ b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
@@ -38,6 +38,7 @@ metadata:
       - method: merge
         path: .
   storagePolicy: cleartext
+
 data:
   values:
     labels:
@@ -50,40 +51,70 @@ data:
         - openvswitch
         - sriov
       interface:
-        #tunnel_device: '{{yaml.networks.neutron.interface}}'
-        sriov:
+        tunnel_device: '{{yaml.networks.neutron.interface}}'
+      sriov:
 {% for sriovnet in yaml.sriov.nets %}
-          - device: {{sriovnet.interface}}
-            num_vfs: 32
-            promisc: false
+        - device: {{sriovnet.interface}}
+          num_vfs: 32
+          mtu: 9000
+          promisc: false
 {% endfor %}
-      auto_bridge_add:
-        br-bond0: {{yaml.networks.neutron.interface}}
+      # auto_bridge_add:
+      #   br-ex: {{yaml.networks.neutron.interface}}
     conf:
       plugins:
         openvswitch_agent:
           ovs:
-            bridge_mappings: bond0:br-bond0
+            bridge_mappings: "bond0:br-ex"
         sriov_agent:
           securitygroup:
             firewall_driver: neutron.agent.firewall.NoopFirewallDriver
           sriov_nic:
-            exclude_devices: null
+            exclude_devices: ""
             physical_device_mappings: '
 {%- for sriovnet in yaml.sriov.nets -%}
-{%- if loop.index > 1 -%}
-,
-{%- endif -%}
+{%- if loop.index > 1 -%},{%- endif -%}
 {{sriovnet.physical}}:{{sriovnet.interface}}
-{%- endfor %}'
+{%- endfor -%}'
         ml2_conf:
           ml2:
-            mechanism_drivers: l2population,openvswitch,sriovnicswitch
+            mechanism_drivers: openvswitch,l2population,sriovnicswitch
+            # type_drivers: flat,vlan
+            # tenant_network_types: vlan
           ml2_type_vlan:
             network_vlan_ranges: bond0:46:300
 {%- for sriovnet in yaml.sriov.nets -%}
 ,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
 {%- endfor %}
 
+          # ml2_type_flat:
+          #  flat_networks: public
+        ml2_conf_sriov: null
+      paste:
+        app:neutronversions:
+          paste.app_factory: neutron.pecan_wsgi.app:versions_factory
+  dependencies:
+    - openstack-neutron-helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-neutron-helm-toolkit
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+  substitutions:
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.osh.neutron-htk
+      dest:
+        path: .source
+data:
+  chart_name: openstack-neutron-helm-toolkit
+  release: openstack-neutron-helm-toolkit
+  namespace: helm-toolkit
+  values: {}
+  dependencies: []
 ...
-