Updated templates for ovs-dpdk site type

[yaml_builds.git] / site_type / ovsdpdk / templates / software / charts / osh / openstack-compute-kit / neutron.j2

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 f18b53a..30a615c 100644 (file)
--- 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
@@ -33,46 +33,70 @@ metadata:
   storagePolicy: cleartext
 data:
   values:
-    labels:
-      agent:
-        sriov:
-          node_selector_key: sriov
-          node_selector_value: enabled
     network:
-      backend:
-        - openvswitch
-        - sriov
       interface:
-        sriov:
-{% for sriovnet in yaml.sriov.nets %}
-          - device: {{sriovnet.interface}}
-            num_vfs: 32
-            promisc: false
-{% endfor %}
+        tunnel: br-phy
+    endpoints:
+      identity:
+        port:
+          api:
+            default: 80
+            internal: 35357
     conf:
+      logging:
+        logger_root:
+          level: WARNING
+          handlers: stdout
       plugins:
         openvswitch_agent:
           ovs:
-            bridge_mappings: bond0:br-bond0
-        sriov_agent:
-          securitygroup:
-            firewall_driver: neutron.agent.firewall.NoopFirewallDriver
-          sriov_nic:
-            exclude_devices: null
-            physical_device_mappings: ' 
-{%- for sriovnet in yaml.sriov.nets -%}
-{%- if loop.index > 1 -%}
-,
-{%- endif -%}
-{{sriovnet.physical}}:{{sriovnet.interface}}
-{%- endfor %}'
+            bridge_mappings: external:br-phy
         ml2_conf:
           ml2:
-            mechanism_drivers: l2population,openvswitch,sriovnicswitch
+            mechanism_drivers: openvswitch
+            type_drivers: flat,vlan,vxlan
+            tenant_network_types: vxlan
           ml2_type_vlan:
-            network_vlan_ranges: bond0:46:300
-{%- for sriovnet in yaml.sriov.nets -%}
-,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
-{%- endfor %}
-
+            network_vlan_ranges: "external:1100:1110"
+          ml2_type_flat:
+            flat_networks: public
+        openvswitch_agent:
+          agent:
+            tunnel_types: vxlan
+          ovs:
+            bridge_mappings: external:br-phy
+      ovs_dpdk:
+        enabled: true
+        driver: vfio-pci
+        nics:
+{% for nic in yaml.dpdk.nics %}
+          - name: {{ nic.name }}
+            pci_id: '{{ nic.pci_id }}'
+            bridge: {{ nic.bridge }}
+            migrate_ip: {{ nic.migrate_ip }}
+{% endfor %}
+  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: []
 ...