updated templates and scripts for Airship 1.3

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

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 (file)
--- 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 %}
 
 ...
+