X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fneutron.j2;fp=templates%2Faic-clcp-manifests%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fneutron.j2;h=1657cb517c906eb1c78a3b5d56b220a91742406a;hb=refs%2Fchanges%2F69%2F369%2F1;hp=8a8d913ab0ecf9e53acec60b49a4ae311ea15197;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/neutron.j2 b/templates/software/charts/osh/openstack-compute-kit/neutron.j2
similarity index 77%
rename from templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/neutron.j2
rename to templates/software/charts/osh/openstack-compute-kit/neutron.j2
index 8a8d913..1657cb5 100644
--- a/templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/neutron.j2
+++ b/templates/software/charts/osh/openstack-compute-kit/neutron.j2
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -19,22 +19,29 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: neutron
+  replacement: true
   labels:
     component: neutron
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: neutron-5ec
+      name: neutron-global
     actions:
       - method: merge
         path: .
   storagePolicy: cleartext
 data:
   values:
+    labels:
+      agent:
+        sriov:
+          node_selector_key: sriov
+          node_selector_value: enabled
     network:
-      auto_bridge_add:
-        br-bond0: bond0
+      backend:
+        - openvswitch
+        - sriov
       interface:
         sriov:
 {% for sriovnet in yaml.sriovnets %}
@@ -46,9 +53,12 @@ data:
       plugins:
         openvswitch_agent:
           ovs:
-            bridge_mappings: oam:br-bond0
+            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.sriovnets -%}
 {%- if loop.index > 1 -%}
@@ -57,8 +67,10 @@ data:
 {{sriovnet.physical}}:{{sriovnet.interface}}
 {%- endfor %}'
         ml2_conf:
+          ml2:
+            mechanism_drivers: l2population,openvswitch,sriovnicswitch
           ml2_type_vlan:
-            network_vlan_ranges: oam:100:4000
+            network_vlan_ranges: bond0:46:300
 {%- for sriovnet in yaml.sriovnets -%}
 ,{{sriovnet.physical}}:{{sriovnet.vlan_start}}:{{sriovnet.vlan_end}}
 {%- endfor %}