From 0b41751786e8c170afa73ec17853dc4a77f0b38d Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
Date: Wed, 4 Nov 2020 17:00:53 +0100
Subject: [PATCH] Adding Ceph Dashboard to the Edge roles

This change adds the CephGrafana Service for the
Edge roles.
Also, a new DistributedComputeHCIDashboard is
introduced: the purpose of this role is to support
the StorageDashboard network on the edge site when
that network is defined and used in central site.

Change-Id: I973e1364e5f3d0e03658acdd37e316a59504825e
---
 roles/DistributedComputeHCI.yaml          |  1 +
 roles/DistributedComputeHCIDashboard.yaml | 80 +++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 roles/DistributedComputeHCIDashboard.yaml

diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml
index 38101e6844..4b0945c78d 100644
--- a/roles/DistributedComputeHCI.yaml
+++ b/roles/DistributedComputeHCI.yaml
@@ -28,6 +28,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
diff --git a/roles/DistributedComputeHCIDashboard.yaml b/roles/DistributedComputeHCIDashboard.yaml
new file mode 100644
index 0000000000..e83c1c299a
--- /dev/null
+++ b/roles/DistributedComputeHCIDashboard.yaml
@@ -0,0 +1,80 @@
+###############################################################################
+# Role: DistributedComputeHCIDashboard                                        #
+###############################################################################
+- name: DistributedComputeHCIDashboard
+  description: |
+    Distributed Compute Node role with Ceph, Cinder volume, and Glance.
+  tags:
+    - compute
+  networks:
+    InternalApi:
+      subnet: internal_api_subnet
+    Tenant:
+      subnet: tenant_subnet
+    Storage:
+      subnet: storage_subnet
+    StorageMgmt:
+      subnet: storage_mgmt_subnet
+    StorageDashboard:
+      subnet: storage_dashboard_subnet
+  RoleParametersDefault:
+    TunedProfileName: "throughput-performance"
+  # CephOSD present so serial has to be 1
+  update_serial: 1
+  ServicesDefault:
+    - OS::TripleO::Services::Aide
+    - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::BarbicanClient
+    - OS::TripleO::Services::BlockStorageCinderVolume
+    - OS::TripleO::Services::BootParams
+    - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::CephGrafana
+    - OS::TripleO::Services::CephMds
+    - OS::TripleO::Services::CephMgr
+    - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephRbdMirror
+    - OS::TripleO::Services::CephRgw
+    - 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::Etcd
+    - OS::TripleO::Services::GlanceApiEdge
+    - 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::Multipathd
+    - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::NeutronBgpVpnBagpipe
+    - OS::TripleO::Services::NeutronLinuxbridgeAgent
+    - OS::TripleO::Services::NeutronVppAgent
+    - OS::TripleO::Services::NovaAZConfig
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::NovaLibvirtGuests
+    - OS::TripleO::Services::NovaMigrationTarget
+    - OS::TripleO::Services::ContainersLogrotateCrond
+    - OS::TripleO::Services::Podman
+    - OS::TripleO::Services::Rhsm
+    - OS::TripleO::Services::Rsyslog
+    - OS::TripleO::Services::RsyslogSidecar
+    - OS::TripleO::Services::Securetty
+    - 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::Tuned
+    - OS::TripleO::Services::Vpp
+    - OS::TripleO::Services::OVNController
+    - OS::TripleO::Services::OVNMetadataAgent