From 1e2cfcd864e4d4c469bed1213e195539b1cc4bae Mon Sep 17 00:00:00 2001
From: hanish gogada <hanishgogadahcu@gmail.com>
Date: Mon, 9 Apr 2018 16:08:13 +0530
Subject: [PATCH] Removed unnecessary services from the LiquidioCompute role.

OVNcontroller service, along with openvswitch runs in
Liquidio Smart NIC

Added Missing paramters in environment file

Change-Id: Id4f357917cf68dd9b79f2db2d4326fcf9a6a29ef
Closes-Bug: 1761452
---
 environments/cavium-liquidio.yaml | 6 ++++++
 roles/ComputeLiquidio.yaml        | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml
index 67a572bb1a..fe2c05a353 100644
--- a/environments/cavium-liquidio.yaml
+++ b/environments/cavium-liquidio.yaml
@@ -1,5 +1,6 @@
 resource_registry:
    OS::TripleO::Services::LiquidioCompute:  ../puppet/services/liquidio-compute-config.yaml
+   OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml
 
 parameter_defaults:
    LiquidioSriovVfNum: 4
@@ -7,6 +8,11 @@ parameter_defaults:
    LiquidioEnableBonding: true
    LiquidioBondingOptions: active-backup
    LiquidioProviderMappings: 'datacentre:eth1'
+   ComputeLiquidioParameters:
+     KernelArgs: "intel_iommu=on iommu=pt"
+   #NovaSchedulerDefaultFilters: ['RetryFilter', 'AvailabilityZoneFilter', 'RamFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter', 'PciPassthroughFilter']
+   #NovaPCIPassthrough:
+   #  - address: "*:02:00.*"
 
    #LiquidioConfigureMode takes three valid values
    #ml2-odl:- Installation is OpenStack and Opendaylight
diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml
index 52b02922fa..fd2fd6bb6a 100644
--- a/roles/ComputeLiquidio.yaml
+++ b/roles/ComputeLiquidio.yaml
@@ -41,7 +41,6 @@
     - OS::TripleO::Services::Ntp
     - OS::TripleO::Services::LiquidioCompute
     - OS::TripleO::Services::ContainersLogrotateCrond
-    - OS::TripleO::Services::OpenDaylightOvs
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
@@ -54,6 +53,4 @@
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::Tuned
     - OS::TripleO::Services::Vpp
-    - OS::TripleO::Services::OVNController
-    - OS::TripleO::Services::OVNMetadataAgent
     - OS::TripleO::Services::Ptp