Upgrade intel pod 15 to Airship 1.8

Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158
Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f
Signed-off-by: James Gu <james.gu@att.com>

3 files changed, 6 insertions, 123 deletions

diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml
deleted file mode 100644
index 85ec726..0000000
--- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/libvirt.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: libvirt
-  replacement: true
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: libvirt-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  values:
-    network:
-      backend:
-        - openvswitch
-        # - sriov
-...
diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml
index 824c03d..fcbac5b 100644
--- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -1,11 +1,4 @@
 ---
-# 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:
   schema: metadata/Document/v1
@@ -15,60 +8,19 @@ metadata:
     abstract: false
     layer: site
     parentSelector:
-      name: neutron-type
+      name: neutron-cruiserlite
+      component: neutron
     actions:
       - method: merge
         path: .
   storagePolicy: cleartext
 data:
-  wait:
-    timeout: 1800
-  test:
-    timeout: 900
   values:
-    labels:
-      sriov:
-        node_selector_key: sriov
-        node_selector_value: enabled
-    pod:
-      security_context:
-        neutron_sriov_agent:
-          pod:
-            runAsUser: 42424
-          container:
-            neutron_sriov_agent_init:
-              privileged: true
-              runAsUser: 0
-              readOnlyRootFilesystem: false
-            neutron_sriov_agent:
-              readOnlyRootFilesystem: true
-              privileged: true
-    network:
-      interface:
-        sriov:
-          - device: ens785f0
-            num_vfs: 32
-            promisc: false
-      backend:
-        - openvswitch
-        - sriov
+    ## NOTE: "besteffort" helps prevent sriov init script from failing due to the network
+    ## card on pod 15 servers (Intel 82599ES) does not support vf true promiscious mode
+    ## setting. The "besteffort" flag was originally designed for dev environment and is
+    ## not suitable for production environment as it silents all errors during sriov init.
     conf:
       sriov_init:
         - besteffort
-      plugins:
-        ml2_conf:
-          ml2:
-            mechanism_drivers: l2population,openvswitch,sriovnicswitch
-          ml2_type_vlan:
-            ## NOTE: Must have at least 1 sriov network defined
-            network_vlan_ranges: external,sriovnet1:100:4000
-        sriov_agent:
-          securitygroup:
-            firewall_driver: neutron.agent.firewall.NoopFirewallDriver
-          sriov_nic:
-            ## NOTE: Must have at least 1 sriov network to physical device
-            ##       mapping, otherwise sriov agent readiness check
-            ##       will fail.
-            physical_device_mappings: sriovnet1:ens785f0
-            exclude_devices: ""
 ...
diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml
deleted file mode 100644
index 9761a25..0000000
--- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# This file defines hardware-specific settings for nova. 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. vcpu_pin_set will change if the number of logical CPUs on the hardware
-#    changes.
-# 2. pci alias / passthrough_whitelist could change if the NIC type or NIC
-#    slotting changes.
-# TODO: Should move to global layer and become tied to the hardware profile
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: nova
-  replacement: true
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: nova-cntt
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-  substitutions:
-    - src:
-        schema: drydock/HardwareProfile/v1
-        name: intel-pod15
-        path: .cpu_sets.kvm
-      dest:
-        path: .values.conf.nova.DEFAULT.vcpu_pin_set
-data:
-  values:
-    network:
-      backend:
-       - openvswitch
-       # - sriov
-    conf:
-      nova:
-        filter_scheduler:
-          available_filters: "nova.scheduler.filters.all_filters"
-          enabled_filters:  "RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AggregateCoreFilter,AggregateRamFilter,AggregateMultiTenancyIsolation,JsonFilter,IoOpsFilter,AggregateDiskFilter,AllHostsFilter,IsolatedHostsFilter,AggregateImagePropertiesIsolation,PciPassthroughFilter,AggregateIoOpsFilter,NumInstancesFilter,AggregateNumInstancesFilter,MetricsFilter,SimpleCIDRAffinityFilter,AggregateTypeAffinityFilter,NUMATopologyFilter,ComputeCapabilitiesFilter,DifferentHostFilter,SameHostFilter"
-        pci:
-          alias: '{"name": "numa0", "capability_type": "pci", "product_id": "154c", "vendor_id": "8086", "device_type": "type-PCI"}'
-          passthrough_whitelist: |
-              [{"address": "0000:05:06.*", "physical_network": "sriovnet1"},{"address": "0000:05:07.*", "physical_network": "sriovnet1"},{"address": "0000:05:08.*", "physical_network": "sriovnet1"},{"address": "0000:05:09.*", "physical_network": "sriovnet1"}]
-...