From d6b1cb7b490a60ac32f55f58abcf849d6f2565b1 Mon Sep 17 00:00:00 2001
From: Karol Babioch <kbabioch@suse.de>
Date: Nov 14 2019 21:13:03 +0000
Subject: Use and instead of ampersand in description of firewalld service


The ampersand symbol (&) caused issues with firewalld:

```
ERROR: Failed to load service file
'/etc/firewalld/services/monitoring.xml': INVALID_SERVICE: not a valid
service file: not well-formed (invalid token): line 9, column 74
```

For the sake of simplicity I've replaced this symbol with "and".

---

diff --git a/pillar/id/slimhat_infra_opensuse_org.sls b/pillar/id/slimhat_infra_opensuse_org.sls
index 20fd2cb..160c504 100644
--- a/pillar/id/slimhat_infra_opensuse_org.sls
+++ b/pillar/id/slimhat_infra_opensuse_org.sls
@@ -29,7 +29,7 @@ firewalld:
     monitoring:
       short: monitoring
       description: >-
-        These ports are required for monitoring based on check_mk & NRPE.
+        These ports are required for monitoring based on check_mk and NRPE.
       ports:
         tcp:
           - 5665