Merge pull request #1256 from openshift/master

sync master -> prod branch

7 files changed, 74 insertions, 66 deletions

diff --git a/filter_plugins/openshift_master.py b/filter_plugins/openshift_master.py
index 7ababc51a..35a881a85 100644
--- a/filter_plugins/openshift_master.py
+++ b/filter_plugins/openshift_master.py
@@ -478,8 +478,8 @@ class FilterModule(object):
                            'master3.example.com']
                returns True
         '''
-        if not issubclass(type(data), str):
-            raise errors.AnsibleFilterError("|failed expects data is a string")
+        if not issubclass(type(data), basestring):
+            raise errors.AnsibleFilterError("|failed expects data is a string or unicode")
         if not issubclass(type(masters), list):
             raise errors.AnsibleFilterError("|failed expects masters is a list")
         valid = True
diff --git a/playbooks/aws/openshift-cluster/cluster_hosts.yml b/playbooks/aws/openshift-cluster/cluster_hosts.yml
index d6b413c6f..1023f3ec1 100644
--- a/playbooks/aws/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/aws/openshift-cluster/cluster_hosts.yml
@@ -1,22 +1,17 @@
 ---
-g_etcd_hosts:   "{{ (groups['tag_host-type_etcd']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_all_hosts:     "{{ groups['tag_clusterid_' ~ cluster_id] | default([])
+                    | intersect(groups['tag_environment_' ~ cluster_env] | default([])) }}"
 
-g_lb_hosts:     "{{ (groups['tag_host-type_lb']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_etcd'] | default([])) }}"
 
-g_master_hosts: "{{ (groups['tag_host-type_master']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type_lb'] | default([])) }}"
 
-g_node_hosts:   "{{ (groups['tag_host-type_node']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type_nfs'] | default([])) }}"
 
-g_nfs_hosts:    "{{ (groups['tag_host-type_nfs']|default([]))
-                   | intersect((groups['tag_environment_' ~ cluster_id]|default([]))) }}"
+g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type_master'] | default([])) }}"
 
-g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
-                    | union(g_lb_hosts) | default([]) }}"
+g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_node'] | default([])) }}"
+
+g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type_infra']) | default([]) }}"
+
+g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_compute']) | default([]) }}"
diff --git a/playbooks/gce/openshift-cluster/cluster_hosts.yml b/playbooks/gce/openshift-cluster/cluster_hosts.yml
index 2bfcedfc9..15690e3bf 100644
--- a/playbooks/gce/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/gce/openshift-cluster/cluster_hosts.yml
@@ -1,22 +1,17 @@
 ---
-g_etcd_hosts:   "{{ (groups['tag_host-type-etcd']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_all_hosts:     "{{ groups['tag_clusterid-' ~ cluster_id] | default([])
+                    | intersect(groups['tag_environment-' ~ cluster_env] | default([])) }}"
 
-g_lb_hosts:     "{{ (groups['tag_host-type-lb']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-etcd'] | default([])) }}"
 
-g_master_hosts: "{{ (groups['tag_host-type-master']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type-lb'] | default([])) }}"
 
-g_node_hosts:   "{{ (groups['tag_host-type-node']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type-nfs'] | default([])) }}"
 
-g_nfs_hosts:    "{{ (groups['tag_host-type-nfs']|default([]))
-                   | intersect((groups['tag_environment-' ~ cluster_id]|default([]))) }}"
+g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type-master'] | default([])) }}"
 
-g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
-                    | union(g_lb_hosts) | default([]) }}"
+g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-node'] | default([])) }}"
+
+g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type-infra']) | default([]) }}"
+
+g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-compute']) | default([]) }}"
diff --git a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml b/playbooks/libvirt/openshift-cluster/cluster_hosts.yml
index 198a3e4e2..15690e3bf 100644
--- a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/libvirt/openshift-cluster/cluster_hosts.yml
@@ -1,22 +1,17 @@
 ---
-g_etcd_hosts:   "{{ (groups['tag_host-type-etcd']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_all_hosts:     "{{ groups['tag_clusterid-' ~ cluster_id] | default([])
+                    | intersect(groups['tag_environment-' ~ cluster_env] | default([])) }}"
 
-g_lb_hosts:     "{{ (groups['tag_host-type-lb']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-etcd'] | default([])) }}"
 
-g_master_hosts: "{{ (groups['tag_host-type-master']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type-lb'] | default([])) }}"
 
-g_node_hosts:   "{{ (groups['tag_host-type-node']|default([]))
-                   | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                   | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type-nfs'] | default([])) }}"
 
-g_nfs_hosts:    "{{ (groups['tag_host-type-node']|default([]))
-                   | intersect((groups['tag_environment-' ~ cluster_id]|default([]))) }}"
+g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type-master'] | default([])) }}"
 
-g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
-                    | union(g_lb_hosts) | default([]) }}"
+g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-node'] | default([])) }}"
+
+g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type-infra']) | default([]) }}"
+
+g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-compute']) | default([]) }}"
diff --git a/playbooks/openstack/openshift-cluster/cluster_hosts.yml b/playbooks/openstack/openshift-cluster/cluster_hosts.yml
index bc586d983..1023f3ec1 100644
--- a/playbooks/openstack/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/openstack/openshift-cluster/cluster_hosts.yml
@@ -1,22 +1,17 @@
 ---
-g_etcd_hosts:   "{{ (groups['tag_host-type_etcd']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_all_hosts:     "{{ groups['tag_clusterid_' ~ cluster_id] | default([])
+                    | intersect(groups['tag_environment_' ~ cluster_env] | default([])) }}"
 
-g_lb_hosts:     "{{ (groups['tag_host-type_lb']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_etcd'] | default([])) }}"
 
-g_master_hosts: "{{ (groups['tag_host-type_master']|default([]))
-                     | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type_lb'] | default([])) }}"
 
-g_node_hosts:   "{{ (groups['tag_host-type_node']|default([]))
-                   | intersect((groups['tag_clusterid_' ~ cluster_id]|default([])))
-                   | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}"
+g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type_nfs'] | default([])) }}"
 
-g_nfs_hosts:  "{{ (groups['tag_host-type_nfs']|default([]))
-                   | intersect((groups['tag_environment_' ~ cluster_id]|default([]))) }}"
+g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type_master'] | default([])) }}"
 
-g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
-                    | union(g_lb_hosts) | default([]) }}"
+g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type_node'] | default([])) }}"
+
+g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type_infra']) | default([]) }}"
+
+g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type_compute']) | default([]) }}"
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 7552086d4..1c8d88854 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -41,6 +41,10 @@
   tags:
   - zagg_server
 
+- include_vars: template_config_loop.yml
+  tags:
+  - config_loop
+
 - name: Include Template Heartbeat
   include: ../../lib_zabbix/tasks/create_template.yml
   vars:
@@ -150,3 +154,13 @@
     password: "{{ ozb_password }}"
   tags:
   - zagg_server
+
+- name: Include Template Config Loop
+  include: ../../lib_zabbix/tasks/create_template.yml
+  vars:
+    template: "{{ g_template_config_loop }}"
+    server: "{{ ozb_server }}"
+    user: "{{ ozb_user }}"
+    password: "{{ ozb_password }}"
+  tags:
+  - config_loop
diff --git a/roles/os_zabbix/vars/template_config_loop.yml b/roles/os_zabbix/vars/template_config_loop.yml
new file mode 100644
index 000000000..823da1868
--- /dev/null
+++ b/roles/os_zabbix/vars/template_config_loop.yml
@@ -0,0 +1,14 @@
+---
+g_template_config_loop:
+  name: Template Config Loop
+  zitems:
+  - key: config_loop.run.exit_code
+    applications:
+    - Config Loop
+    value_type: int
+
+  ztriggers:
+  - name: 'config_loop.run.exit_code not zero on {HOST.NAME}'
+    expression: '{Template Config Loop:config_loop.run.exit_code.min(#2)}>0'
+    url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_config_loop.asciidoc'
+    priority: average