diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
| commit | a706860af853be6d8bc77ea38593467e827ed527 (patch) | |
| tree | aaaa4997ba9da249ef09f2f509b4b1a25500993c /roles | |
| parent | 5758fdc75659bdd9a02cc56efb7255d677233ad2 (diff) | |
| parent | 63b19e964fcc09e60562fd253d725edcc2ec4aef (diff) | |
| download | openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.gz openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.bz2 openshift-a706860af853be6d8bc77ea38593467e827ed527.tar.xz openshift-a706860af853be6d8bc77ea38593467e827ed527.zip | |
Merge pull request #790 from openshift/master
Merge master into prod
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_os_linux.yml | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 795f38341..ac19fac5f 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -534,7 +534,7 @@ def set_deployment_facts_if_unset(facts): if deployment_type == 'origin': version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('1.0.6') else: - version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('3.0.2') + version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('3.0.2.900') else: version_gt_3_1_or_1_1 = True facts['common']['version_greater_than_3_1_or_1_1'] = version_gt_3_1_or_1_1 diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 3e4f78b17..527c5231a 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -1,5 +1,7 @@ apiLevels: +{% if openshift.common.deployment_type == "enterprise" %} - v1beta3 +{% endif %} - v1 apiVersion: v1 assetConfig: @@ -66,7 +68,9 @@ kubeletClientInfo: {% if openshift.master.embedded_kube | bool %} kubernetesMasterConfig: apiLevels: +{% if openshift.common.deployment_type == "enterprise" %} - v1beta3 +{% endif %} - v1 apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }} controllerArguments: {{ controller_args if controller_args is defined else 'null' }} diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index 3ae1500bc..aeeec4b8d 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -246,15 +246,15 @@ g_template_os_linux: # CPU Utilization # - name: 'CPU idle less than 5% on {HOST.NAME}' - expression: '{Template OS Linux:kernel.all.cpu.idle.last()}<5 and {Template OS Linux:kernel.all.cpu.idle.last(#2)}<5' + expression: '{Template OS Linux:kernel.all.cpu.idle.max(#5)}<5' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_cpu_idle.asciidoc' priority: average description: 'CPU is less than 5% idle' - name: 'CPU idle less than 10% on {HOST.NAME}' - expression: '{Template OS Linux:kernel.all.cpu.idle.last()}<10 and {Template OS Linux:kernel.all.cpu.idle.last(#2)}<10' + expression: '{Template OS Linux:kernel.all.cpu.idle.max(#5)}<10' url: 'https://github.com/openshift/ops-sop/blob/master/V3/Alerts/check_cpu_idle.asciidoc' - priority: warn + priority: average description: 'CPU is less than 10% idle' dependencies: - 'CPU idle less than 5% on {HOST.NAME}' |