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%2Ftemplates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fneutron.j2;h=b3a570c96239944ab0ec5aff87a29929a06ce05d;hb=fbb206730195c6f03ded7658d08f1ef708ebf88b;hp=f18b53a3903072f35bad702754c9030d98d16bf2;hpb=3395a537e26721ec33a80f66686ca932f9328722;p=yaml_builds.git

diff --git a/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2 b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
similarity index 83%
rename from site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2
rename to site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
index f18b53a..b3a570c 100644
--- a/site_type/sriov/templates/software/charts/osh/openstack-compute-kit/neutron.j2
+++ b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/neutron.j2
@@ -14,6 +14,13 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 ##############################################################################
+# This file defines hardware-specific settings for neutron. If you use the same
+# hardware profile as this environment, you should not need to change this file.
+# Otherwise, you should review the settings here and adjust for your hardware.
+# In particular:
+# 1. logical network interface names
+# 2. physical device mappigns
+# TODO: Should move to global layer and become tied to the hardware profile
 
 schema: armada/Chart/v1
 metadata:
@@ -43,6 +50,7 @@ data:
         - openvswitch
         - sriov
       interface:
+        tunnel_device: '{{yaml.networks.neutron.interface}}'
         sriov:
 {% for sriovnet in yaml.sriov.nets %}
           - device: {{sriovnet.interface}}
@@ -59,7 +67,7 @@ data:
             firewall_driver: neutron.agent.firewall.NoopFirewallDriver
           sriov_nic:
             exclude_devices: null
-            physical_device_mappings: ' 
+            physical_device_mappings: '
 {%- for sriovnet in yaml.sriov.nets -%}
 {%- if loop.index > 1 -%}
 ,
@@ -76,3 +84,4 @@ data:
 {%- endfor %}
 
 ...
+