testnode: Run grafana_agent role optionally

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index 81faaff2e0c48dcc62214354b5fe5d599805e934..e27e307a8969fdbe01022713a618854403f00101 100644 (file)
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -303,6 +303,11 @@ Configure ``cachefilesd``.  See https://tracker.ceph.com/issues/6373.  Defaults
     cachefilesd_fstop
     cachefilesd_secctx
 
+Include the grafana_agent role to report testnode resource statistics to Grafana.  Defaults to ``false``::
+
+    run_grafana_agent_role: true
+
+
 Tags
 ++++
 

diff --git a/roles/testnode/meta/main.yml b/roles/testnode/meta/main.yml
index 313fd690f5044eac9e181196dbe7e33b1be37fe4..fdd49f88d9b35e0bd97ca3b3c3e73cd5da1adf1a 100644 (file)
--- a/roles/testnode/meta/main.yml
+++ b/roles/testnode/meta/main.yml
@@ -1,3 +1,5 @@
 ---
 dependencies:
   - role: secrets
+  - role: grafana_agent
+    when: run_grafana_agent_role is defined and run_grafana_agent_role

diff --git a/testnodes.yml b/testnodes.yml
index ce49a560058822257a06bf1596a38ab7167283bb..21ba344680c259214ce82948747f59ac1a7b1c7a 100644 (file)
--- a/testnodes.yml
+++ b/testnodes.yml
@@ -4,5 +4,4 @@
   roles:
     - common
     - testnode
-    - grafana_agent
   become: true