commit e983d454213965e3dfb5e3f77cec810d187b9b85
author Denis Egorenko <degorenko@mirantis.com> Fri Aug 23 14:29:34 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Mon Aug 26 13:50:18 2019 +0400
tree e6e893708e67e4a6c280a103950c238a250a65d9
parent 6749a376be28e2a433271144cd26ebb5576bd650

Get rid of hardcoded node names in pipelines

Change-Id: I2cbb062e7e1a8d7c6e41f8234581e66d063276c9
Related-Prod: PROD-25517

ceph-add-osd-upmap.groovy

diff --git a/ceph-add-osd-upmap.groovy b/ceph-add-osd-upmap.groovy
index 96ca29d..4bbb78d 100644
--- a/ceph-add-osd-upmap.groovy
+++ b/ceph-add-osd-upmap.groovy
@@ -64,7 +64,8 @@
 
         stage ("verify client versions")
         {
-          def nodes = salt.getMinions("pepperEnv", "I@ceph:common and not E@mon*")
+          // I@docker:swarm and I@prometheus:server - mon* nodes
+          def nodes = salt.getMinions("pepperEnv", "I@ceph:common and not ( I@docker:swarm and I@prometheus:server )")
           for ( node in nodes )
           {
             def versions = salt.cmdRun("pepperEnv", node, "ceph features --format json", checkResponse=true, batch=null, output=false).values()[0]