diff options
| -rw-r--r-- | README_AEP.md | 6 | ||||
| -rwxr-xr-x | git/yaml_validation.py | 7 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_openshift_master.yml | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/README_AEP.md b/README_AEP.md index 99bc79548..739c4baeb 100644 --- a/README_AEP.md +++ b/README_AEP.md @@ -16,11 +16,11 @@ * One or more RHEL 7.1 VMs * Either ssh key based auth for the root user or ssh key based auth for a user with sudo access (no password) -* A checkout of atomic-enterprise-ansible from https://github.com/projectatomic/atomic-enterprise-ansible/ +* A checkout of openshift-ansible from https://github.com/openshift/openshift-ansible/ ```sh - git clone https://github.com/projectatomic/atomic-enterprise-ansible.git - cd atomic-enterprise-ansible + git clone https://github.com/openshift/openshift-ansible.git + cd openshift-ansible ``` ## Caveats diff --git a/git/yaml_validation.py b/git/yaml_validation.py index 2b5c8ed49..69fd455a5 100755 --- a/git/yaml_validation.py +++ b/git/yaml_validation.py @@ -47,7 +47,12 @@ def main(): print "+++++++ Received: %s" % file_mod - if not file_mod.endswith('.yml') and not file_mod.endswith('.yaml') and not os.path.islink(file_mod): + # if the file extensions is not yml or yaml, move along. + if not file_mod.endswith('.yml') and not file_mod.endswith('.yaml'): + continue + + # We use symlinks in our repositories, ignore them. + if os.path.islink(file_mod): continue try: diff --git a/roles/os_zabbix/vars/template_openshift_master.yml b/roles/os_zabbix/vars/template_openshift_master.yml index 6686a8757..12ea36c8b 100644 --- a/roles/os_zabbix/vars/template_openshift_master.yml +++ b/roles/os_zabbix/vars/template_openshift_master.yml @@ -318,14 +318,14 @@ g_template_openshift_master: priority: high - name: 'SkyDNS port not listening on {HOST.NAME}' - expression: '{Template Openshift Master:openshift.master.skydns.port.open(#3)}<1' + expression: '{Template Openshift Master:openshift.master.skydns.port.open.max(#3)}<1' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_master.asciidoc' dependencies: - 'Openshift Master process not running on {HOST.NAME}' priority: high - name: 'SkyDNS query failed on {HOST.NAME}' - expression: '{Template Openshift Master:openshift.master.skydns.query(#3)}<1' + expression: '{Template Openshift Master:openshift.master.skydns.query.max(#3)}<1' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/openshift_master.asciidoc' dependencies: - 'Openshift Master API health check is failing on {HOST.NAME}' |