Moving dev branch code to master branch

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

diff --git a/templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/nova.j2 b/templates/software/charts/osh/openstack-compute-kit/nova.j2
similarity index 65%
rename from templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/nova.j2
rename to templates/software/charts/osh/openstack-compute-kit/nova.j2
index 5555db4..5cd0e3e 100644 (file)
--- a/templates/aic-clcp-manifests/software/charts/osh/openstack-compute-kit/nova.j2
+++ b/templates/software/charts/osh/openstack-compute-kit/nova.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.                   #
@@ -25,31 +25,28 @@ metadata:
     abstract: false
     layer: site
     parentSelector:
-      name: nova-5ec
+      name: nova-global
     actions:
       - method: merge
         path: .
   storagePolicy: cleartext
 data:
   values:
+    network:
+      backend:
+        - openvswitch
+        - sriov
     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: "4-23,28-47"
+          vcpu_pin_set: "4-21,26-43,48-65,72-87"
+          vif_plugging_is_fatal: False
+          vif_plugging_timeout: 30
         pci:
-          alias: '{"name": "numa0", "capability_type": "pci", "product_id": "154c", "vendor_id": "8086", "device_type": "type-PCI", "numa_policy": "required"}'
-          passthrough_whitelist: |
-            [
-{%- for sriov in yaml.sriovnets -%}
-  {%set sriovloop = loop%}
-  {%- for whitelist in sriov.whitelists -%}
-    {%- if sriovloop.index > 1 or loop.index > 1 -%}
-    ,
-    {%- endif -%}
-  {"address": "{{whitelist.address}}", "physical_network": "{{sriov.physical}}", "trusted": "true"}
-  {%- endfor -%}
-{%- endfor -%}
-]
+          alias: '{ "vendor_id":"10de", "product_id":"1db4", "name":"V100", "device_type":"type-PCI" }'
+          passthrough_whitelist: '{"vendor_id": "10de", "product_id": "1db4"}'
 ...