Merge pull request #219 from Cray-HPE/mergeback-master-CASMPET-6860-1…

…700670684 [chore] master -> develop from PR #217 (CASMPET-6860)
Cray-HPE · Nov 30, 2023 · 5908070 · 5908070
2 parents 8f2bdf0 + ce8edd0
commit 5908070
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.17.1] - 2023-11-20
+
+### Changed
+
+- CASMPET-6860: Change the `csm.storage.smartmon` play so it redeploys `node-exporter` using 'cephadm shell' instead of a 'ceph' command.
+
 ## [1.17.0] - 2023-10-18
 
 ### Dependencies

diff --git a/ansible/roles/csm.storage.smartmon/tasks/main.yml b/ansible/roles/csm.storage.smartmon/tasks/main.yml
@@ -37,8 +37,13 @@
 - name: Redeploy node-exporter
   when:
     - admin_keyring.stat.exists
+  command: "cephadm shell --mount /etc/cray/ceph/ -- ceph orch apply -i /mnt/node-exporter.yml"
+  register: apply_node_exporter
+
+- name: Reconfig node-exporter
+  when:
+    - (apply_node_exporter.rc is defined) and (apply_node_exporter.rc == 0)
   command: "ceph orch {{ item }} "
   with_items:
-  - apply -i /etc/cray/ceph/node-exporter.yml
   - reconfig node-exporter
   - redeploy node-exporter