update calico, neutron and nova settings

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

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 31a24bb..fe58681 100644 (file)
--- 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
@@ -47,6 +47,7 @@ data:
           node_selector_key: sriov
           node_selector_value: enabled
     network:
+      auto_bridge_add: {br-ex: bond0}
       backend:
         - openvswitch
         - sriov
@@ -59,11 +60,14 @@ data:
           mtu: 9000
           promisc: false
 {% endfor %}
+    conf:
       # auto_bridge_add:
       #   br-ex: {{yaml.networks.neutron.interface}}
-    conf:
+      dhcp_lease_duration: = 86400
       plugins:
         openvswitch_agent:
+          agent:
+            tunnel_types: vxlan
           ovs:
             bridge_mappings: "bond0:br-ex"
         sriov_agent: