From aa2be6cbe07ce7c1dac2254eb33e79bc4a67f958 Mon Sep 17 00:00:00 2001
From: Karthik S <ksundara@redhat.com>
Date: Thu, 6 Jun 2019 05:47:08 +0000
Subject: [PATCH] Add ComputeHCIOvsDpdk role

Created a role for ComputeHCI and OvS DPDK based on the existing
ComputeHCI and ComputeOvsDpdk roles.

Change-Id: Ib5ead8dbfd3e0697585d7ff597634b7f42df1052
(cherry picked from commit 166dd42fcdc834cf2ea053a979ae3d012cb7b7e6)
---
 roles/ComputeHCIOvsDpdk.yaml | 65 ++++++++++++++++++++++++++++++++++++
 tools/yaml-validate.py       |  6 ++--
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 roles/ComputeHCIOvsDpdk.yaml

diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml
new file mode 100644
index 0000000000..f80a790ba8
--- /dev/null
+++ b/roles/ComputeHCIOvsDpdk.yaml
@@ -0,0 +1,65 @@
+###############################################################################
+# Role: ComputeHCIOvsDpdk                                                     #
+###############################################################################
+- name: ComputeHCIOvsDpdk
+  description: |
+    ComputeOvsDpdk Node role hosting Ceph OSD too
+  networks:
+    InternalApi:
+      subnet: internal_api_subnet
+    Tenant:
+      subnet: tenant_subnet
+    Storage:
+      subnet: storage_subnet
+    StorageMgmt:
+      subnet: storage_mgmt_subnet
+  RoleParametersDefault:
+    TunedProfileName: "cpu-partitioning"
+    VhostuserSocketGroup: "hugetlbfs"
+    NovaLibvirtRxQueueSize: 1024
+    NovaLibvirtTxQueueSize: 1024
+  ServicesDefault:
+    - OS::TripleO::Services::Aide
+    - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::BootParams
+    - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::CephOSD
+    - OS::TripleO::Services::CertmongerUser
+    - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::ComputeCeilometerAgent
+    - OS::TripleO::Services::ComputeNeutronCorePlugin
+    - OS::TripleO::Services::ComputeNeutronL3Agent
+    - OS::TripleO::Services::ComputeNeutronMetadataAgent
+    - OS::TripleO::Services::ComputeNeutronOvsDpdk
+    - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::Fluentd
+    - OS::TripleO::Services::IpaClient
+    - OS::TripleO::Services::Ipsec
+    - OS::TripleO::Services::Iscsid
+    - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::LoginDefs
+    - OS::TripleO::Services::MetricsQdr
+    - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::NeutronBgpVpnBagpipe
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
+    - OS::TripleO::Services::NovaMigrationTarget
+    - OS::TripleO::Services::ContainersLogrotateCrond
+    - OS::TripleO::Services::OpenDaylightOvs
+    - OS::TripleO::Services::Podman
+    - OS::TripleO::Services::Rhsm
+    - OS::TripleO::Services::RsyslogSidecar
+    - OS::TripleO::Services::Securetty
+    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
+    - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Timesync
+    - OS::TripleO::Services::Timezone
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::OVNController
+    - OS::TripleO::Services::OVNMetadataAgent
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index f5f1ffd547..2ffab71ec9 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -1072,13 +1072,15 @@ def validate(filename, param_map):
         if filename.startswith('./roles/'):
             retval = validate_role_name(filename)
 
-        if filename.startswith('./roles/ComputeHCI.yaml'):
+        if filename.startswith('./roles/ComputeHCI.yaml') or \
+                filename.startswith('./roles/ComputeHCIOvsDpdk.yaml'):
             retval |= validate_hci_computehci_role(filename, tpl)
 
         if filename.startswith('./roles/ComputeOvsDpdk.yaml') or \
                 filename.startswith('./roles/ComputeSriov.yaml') or \
                 filename.startswith('./roles/ComputeOvsDpdkRT.yaml') or \
-                filename.startswith('./roles/ComputeSriovRT.yaml'):
+                filename.startswith('./roles/ComputeSriovRT.yaml') or \
+                filename.startswith('./roles/ComputeHCIOvsDpdk.yaml'):
             exclude = [
                 'OS::TripleO::Services::OVNController',
                 'OS::TripleO::Services::ComputeNeutronOvsAgent',