update calico, neutron and nova settings

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

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 44909af..87b5331 100644 (file)
--- 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
@@ -39,24 +39,23 @@ metadata:
       - method: merge
         path: .
   storagePolicy: cleartext
+#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: |