commit d8dc1edc5371c35131044857fe1e04256ae89758
author Martin Polreich <mpolreich@mirantis.com> Wed Aug 16 13:24:26 2017 +0000
committer Martin Polreich <mpolreich@mirantis.com> Wed Aug 16 13:24:26 2017 +0000
tree f7f94cfb10b8828161e3d0e3dba09138c4f2cf3a
parent e048a839e5d62dab349a5cf20fc9c2886add175f

Revert "Update sl_k8s_calico models"

This reverts commit e048a839e5d62dab349a5cf20fc9c2886add175f.

Change-Id: Ic03d0e11deabca745a2601ef191acb56e77841b7

classes/cluster/sl_k8s_calico/stacklight/init.yml

diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index 243a614..6df9960 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,12 +1,16 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.prometheus.collector
+- system.telegraf.agent
 parameters:
   _param:
     stacklight_monitor_address: 172.16.10.252
-    stacklight_node01_hostname: mon01
-    stacklight_node02_hostname: mon02
-    stacklight_node03_hostname: mon03
-    stacklight_node01_address: 172.16.10.107
-    stacklight_node02_address: 172.16.10.108
-    stacklight_node03_address: 172.16.10.109
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
 
     # Glusterfs
     glusterfs_service_host: ${_param:stacklight_monitor_address}
@@ -35,20 +39,20 @@
           - mon
           - mon.${_param:cluster_domain}
         mon01:
-          address: ${_param:stacklight_node01_address}
+          address: ${_param:stacklight_monitor_node01_address}
           names:
-          - ${_param:stacklight_node01_hostname}
-          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
         mon02:
-          address: ${_param:stacklight_node02_address}
+          address: ${_param:stacklight_monitor_node02_address}
           names:
-          - ${_param:stacklight_node02_hostname}
-          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
         mon03:
-          address: ${_param:stacklight_node03_address}
+          address: ${_param:stacklight_monitor_node03_address}
           names:
-          - ${_param:stacklight_node03_hostname}
-          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}