From 9d8dcf87bdc0f03ad6829e69383d4fc49ef7cb73 Mon Sep 17 00:00:00 2001
From: josecastillolema <josecastillolema@gmail.com>
Date: Thu, 2 Jan 2020 08:36:00 -0300
Subject: [PATCH] Hyper-converged SR-IOV role for compute nodes.

Already implemented, tested and validated.
Addressed reviews/comments of Emilien Macchi - Jan 3 10:37 AM - Patch Set 1: Code-Review-1:
  - "it would be nice to have a validate function in tools/yaml-validate.py like we already have for ComputeHCI role": Done, using validate_hci_computehci_role as ComputeHCIOvsDpdk.yaml does.
  - 2 comments inline: adding return line and wront identation: Corrected

Change-Id: I20cd54b677e8da8c3c5691d913c4b6b67bb82e27
Signed-off-by: josecastillolema <josecastillolema@gmail.com>
---
 roles/ComputeHCISriov.yaml | 68 ++++++++++++++++++++++++++++++++++++++
 tools/yaml-validate.py     |  3 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 roles/ComputeHCISriov.yaml

diff --git a/roles/ComputeHCISriov.yaml b/roles/ComputeHCISriov.yaml
new file mode 100644
index 0000000000..3134c1ab23
--- /dev/null
+++ b/roles/ComputeHCISriov.yaml
@@ -0,0 +1,68 @@
+###############################################################################
+# Role: ComputeHCISriov                                                       #
+###############################################################################
+- name: ComputeHCISriov
+  description: |
+    Compute Node with SR-IOV 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"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
+  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::ComputeNeutronOvsAgent
+    - 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::NeutronSriovAgent
+    - OS::TripleO::Services::NeutronSriovHostConfig
+    - OS::TripleO::Services::NeutronVppAgent
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
+    - OS::TripleO::Services::NovaMigrationTarget
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
+    - OS::TripleO::Services::OpenDaylightOvs
+    - 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::Timezone
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::Vpp
+    - OS::TripleO::Services::OVNController
+    - OS::TripleO::Services::OVNMetadataAgent
+    - OS::TripleO::Services::Ptp
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 5f392795cc..f22497e1f3 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -1121,7 +1121,8 @@ def validate(filename, param_map):
             retval = validate_role_name(filename)
 
         if filename.startswith('./roles/ComputeHCI.yaml') or \
-                filename.startswith('./roles/ComputeHCIOvsDpdk.yaml'):
+                filename.startswith('./roles/ComputeHCIOvsDpdk.yaml') or \
+                filename.startswith('./roles/ComputeHCISriov.yaml'):
             retval |= validate_hci_computehci_role(filename, tpl)
 
         if filename.startswith('./roles/ControllerStorageNfs.yaml'):