From 5f21c1ec411711c790de1c15d9ff97d3ed62731d Mon Sep 17 00:00:00 2001
From: Karol Babioch <kbabioch@suse.de>
Date: Nov 04 2019 09:48:25 +0000
Subject: Further refinement of pillar data for CaaSP cluster nodes


---

diff --git a/pillar/id/caasp-l1_infra_opensuse_org.sls b/pillar/id/caasp-l1_infra_opensuse_org.sls
index 72dc89a..0008516 100644
--- a/pillar/id/caasp-l1_infra_opensuse_org.sls
+++ b/pillar/id/caasp-l1_infra_opensuse_org.sls
@@ -6,6 +6,7 @@ grains:
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
   description: Load balancing node of CaaSP cluster
   documentation:
diff --git a/pillar/id/caasp-m1_infra_opensuse_org.sls b/pillar/id/caasp-m1_infra_opensuse_org.sls
index 1063db3..51e3cd3 100644
--- a/pillar/id/caasp-m1_infra_opensuse_org.sls
+++ b/pillar/id/caasp-m1_infra_opensuse_org.sls
@@ -6,8 +6,9 @@ grains:
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
-  description: Master node of CaaSP cluster monitoring and controlling cluster
+  description: Master node of CaaSP cluster monitoring and controlling the cluster
   documentation:
     - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes
   responsible:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-m2.infra.opensuse.org
+    - caasp-m3.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/caasp-m2_infra_opensuse_org.sls b/pillar/id/caasp-m2_infra_opensuse_org.sls
index 1063db3..8f4457d 100644
--- a/pillar/id/caasp-m2_infra_opensuse_org.sls
+++ b/pillar/id/caasp-m2_infra_opensuse_org.sls
@@ -6,8 +6,9 @@ grains:
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
-  description: Master node of CaaSP cluster monitoring and controlling cluster
+  description: Master node of CaaSP cluster monitoring and controlling the cluster
   documentation:
     - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes
   responsible:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-m1.infra.opensuse.org
+    - caasp-m3.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/caasp-m3_infra_opensuse_org.sls b/pillar/id/caasp-m3_infra_opensuse_org.sls
index 1063db3..ad12f04 100644
--- a/pillar/id/caasp-m3_infra_opensuse_org.sls
+++ b/pillar/id/caasp-m3_infra_opensuse_org.sls
@@ -6,8 +6,9 @@ grains:
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
-  description: Master node of CaaSP cluster monitoring and controlling cluster
+  description: Master node of CaaSP cluster monitoring and controlling the cluster
   documentation:
     - https://documentation.suse.com/suse-caasp/4/single-html/caasp-deployment/#_master_nodes
   responsible:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-m1.infra.opensuse.org
+    - caasp-m2.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/caasp-w1_infra_opensuse_org.sls b/pillar/id/caasp-w1_infra_opensuse_org.sls
index 610cb21..4df774e 100644
--- a/pillar/id/caasp-w1_infra_opensuse_org.sls
+++ b/pillar/id/caasp-w1_infra_opensuse_org.sls
@@ -2,10 +2,11 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - Worker node node of CaaSP cluster
+    - Worker node of CaaSP cluster
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
   description: Worker node of CaaSP cluster running actual application containers
   documentation:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-w2.infra.opensuse.org
+    - caasp-w3.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/caasp-w2_infra_opensuse_org.sls b/pillar/id/caasp-w2_infra_opensuse_org.sls
index 610cb21..a427627 100644
--- a/pillar/id/caasp-w2_infra_opensuse_org.sls
+++ b/pillar/id/caasp-w2_infra_opensuse_org.sls
@@ -2,10 +2,11 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - Worker node node of CaaSP cluster
+    - Worker node of CaaSP cluster
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
   description: Worker node of CaaSP cluster running actual application containers
   documentation:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-w1.infra.opensuse.org
+    - caasp-w3.infra.opensuse.org
   weburls: []
diff --git a/pillar/id/caasp-w3_infra_opensuse_org.sls b/pillar/id/caasp-w3_infra_opensuse_org.sls
index 610cb21..6776c43 100644
--- a/pillar/id/caasp-w3_infra_opensuse_org.sls
+++ b/pillar/id/caasp-w3_infra_opensuse_org.sls
@@ -2,10 +2,11 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - Worker node node of CaaSP cluster
+    - Worker node of CaaSP cluster
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
   aliases: []
   description: Worker node of CaaSP cluster running actual application containers
   documentation:
@@ -15,5 +16,7 @@ grains:
     - rklein
     - fbergmann
     - lcavajani
-  partners: []
+  partners:
+    - caasp-w1.infra.opensuse.org
+    - caasp-w2.infra.opensuse.org
   weburls: []