X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fnova.j2;fp=site_type%2Fsriov-a13%2Ftemplates%2Fsoftware%2Fcharts%2Fosh%2Fopenstack-compute-kit%2Fnova.j2;h=80268a6ff2393cb1bd4dc296312a333bcd497f22;hb=a60475447ffe274bed8383907cd8384d543ba555;hp=80f5cde3c48478e265f399350f4996f64f8055e6;hpb=b01cd219b0aee55be2e18ef9b66cd58b2c89134a;p=yaml_builds.git

diff --git a/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/nova.j2 b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/nova.j2
index 80f5cde..80268a6 100644
--- a/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/nova.j2
+++ b/site_type/sriov-a13/templates/software/charts/osh/openstack-compute-kit/nova.j2
@@ -28,8 +28,6 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: nova
-  labels:
-    component: nova
   layeringDefinition:
     abstract: false
     layer: site
@@ -39,48 +37,49 @@ metadata:
       - method: merge
         path: .
   storagePolicy: cleartext
-data:
-  values:
-    network:
-      backend:
-        - openvswitch
-{% if 'sriov' in yaml %}
-        - sriov
-{% endif %}
-    conf:
-      nova:
-        filter_scheduler:
-          enabled_filters: "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter, NUMATopologyFilter, DifferentHostFilter, SameHostFilter"
-        libvirt:
-          virt_type: kvm
-        DEFAULT:
-          vcpu_pin_set: {% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}"{{yaml.platform.vcpu_pin_set}}"
-{% else %}"4-21,26-43,48-65,72-87"
-{% endif %}
-          vif_plugging_is_fatal: False
-          vif_plugging_timeout: 30
-        pci:
-{% if 'gpu' in yaml or 'sriov' in yaml %}
-          alias: |
-  {% if 'sriov' in yaml and 'alias' in yaml.sriov %}
-  {% for alias in yaml.sriov.alias %}
-            '{"name": "{{alias.name}}", "vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}", "capability_type": "pci", "device_type": "type-PCI", "numa_policy": "required"}'
-  {% endfor %}
-  {% endif %}
-  {% if 'gpu' in yaml and 'alias' in yaml.gpu %}
-  {% for alias in yaml.gpu.alias %}
-            '{"name":"{{alias.name}}", "vendor_id":"{{alias.vendor_id}}", "product_id":"{{alias.product_id}}", "device_type":"type-PCI"}'
-  {% endfor %}
-  {% endif %}
-          passthrough_whitelist: |
-            [
-  {%- if 'sriov' in yaml and 'nets' in yaml.sriov %}
-  {% for sriovnet in yaml.sriov.nets %}
-    {%- for vf in sriovnet.whitelists -%}{"address":"{{vf["address"]}}","physical_network":"{{sriovnet.physical}}"}{{',' if not loop.last else ''}}{% endfor %}{{',' if not loop.last else '' -}}
-  {%- endfor -%}
-  {%- if 'gpu' in yaml and 'sriov' in yaml %},{% endif -%}
-  {%- for alias in yaml.gpu.alias %}{"vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}"}{{',' if not loop.last else ''}}{% endfor -%}
-            ]
-  {% endif %}
-{% endif %}
+data: {}
+#data:
+#  values:
+#    network:
+#      backend:
+#        - openvswitch
+#{% if 'sriov' in yaml %}
+#        - sriov
+#{% endif %}
+#    conf:
+#      nova:
+#        filter_scheduler:
+#          enabled_filters: "RetryFilter, AvailabilityZoneFilter, RamFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ServerGroupAntiAffinityFilter, ServerGroupAffinityFilter, PciPassthroughFilter, NUMATopologyFilter, DifferentHostFilter, SameHostFilter"
+#        libvirt:
+#          virt_type: kvm
+#        DEFAULT:
+#          vcpu_pin_set: {% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}"{{yaml.platform.vcpu_pin_set}}"
+#{% else %}"4-21,26-43,48-65,72-87"
+#{% endif %}
+#          vif_plugging_is_fatal: False
+#          vif_plugging_timeout: 30
+#        pci:
+#{% if 'gpu' in yaml or 'sriov' in yaml %}
+#          alias: |
+#  {% if 'sriov' in yaml and 'alias' in yaml.sriov %}
+#  {% for alias in yaml.sriov.alias %}
+#            '{"name": "{{alias.name}}", "vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}", "capability_type": "pci", "device_type": "type-PCI", "numa_policy": "required"}'
+#  {% endfor %}
+#  {% endif %}
+#  {% if 'gpu' in yaml and 'alias' in yaml.gpu %}
+#  {% for alias in yaml.gpu.alias %}
+#            '{"name":"{{alias.name}}", "vendor_id":"{{alias.vendor_id}}", "product_id":"{{alias.product_id}}", "device_type":"type-PCI"}'
+#  {% endfor %}
+#  {% endif %}
+#          passthrough_whitelist: |
+#            [
+#  {%- if 'sriov' in yaml and 'nets' in yaml.sriov %}
+#  {% for sriovnet in yaml.sriov.nets %}
+#    {%- for vf in sriovnet.whitelists -%}{"address":"{{vf["address"]}}","physical_network":"{{sriovnet.physical}}"}{{',' if not loop.last else ''}}{% endfor %}{{',' if not loop.last else '' -}}
+#  {%- endfor -%}
+#  {%- if 'gpu' in yaml and 'sriov' in yaml %},{% endif -%}
+#  {%- for alias in yaml.gpu.alias %}{"vendor_id": "{{alias.vendor_id}}", "product_id": "{{alias.product_id}}"}{{',' if not loop.last else ''}}{% endfor -%}
+#            ]
+#  {% endif %}
+#{% endif %}
 ...