From: Vasishta <vashastr@redhat.com>
Date: Tue, 14 Apr 2020 16:20:31 +0000 (-0400)
Subject: Enables grafana-server role to be added to inventory file
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=057e9c6959404dc0542d32f04f72184543c38747;p=teuthology.git

Enables grafana-server role to be added to inventory file

Signed-off-by: Vasishta <vashastr@redhat.com>
---

diff --git a/teuthology/task/ceph_ansible.py b/teuthology/task/ceph_ansible.py
index 7bd30698d..5a51295cb 100644
--- a/teuthology/task/ceph_ansible.py
+++ b/teuthology/task/ceph_ansible.py
@@ -33,7 +33,7 @@ class CephAnsible(Task):
         in case of multisite
         repo: {git_base}ceph-ansible.git
         branch: mybranch # defaults to master
-        ansible-version: 2.4 # defaults to 2.5
+        ansible-version: 2.8 for RHCS 4.x and 2.6 for RHCS 3.x
         vars:
           ceph_dev: True ( default)
           ceph_conf_overrides:
@@ -64,6 +64,7 @@ class CephAnsible(Task):
         nfss='nfs',
         haproxys='haproxy'
     )
+    groups_to_roles ['grafana-server'] = 'grafana-server'
 
     def __init__(self, ctx, config):
         super(CephAnsible, self).__init__(ctx, config)