From ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Thu, 29 Oct 2015 13:29:19 -0400 Subject: Conditionalizing the support for the v1beta3 api v1beta3 is only supported on OSE 3.0. For 3.0 the deployment_type was "enterprise" --- roles/openshift_master/templates/master.yaml.v1.j2 | 4 ++++ 1 file changed, 4 insertions(+) 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' }} -- cgit v1.2.3 From 39dcaf35142bf335957db23358c14513779ac802 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Thu, 29 Oct 2015 15:58:44 -0400 Subject: Updating multi_ec2 to support extra_vars and extra_groups --- inventory/multi_ec2.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py index 23cf5ecf1..98dde3f3c 100755 --- a/inventory/multi_ec2.py +++ b/inventory/multi_ec2.py @@ -241,23 +241,24 @@ class MultiEc2(object): ''' results = self.all_ec2_results[acc_config['name']] - # Update each hostvar with the newly desired key: value - for new_var, value in acc_config.get('extra_vars', {}).items(): - # Verify the account results look sane - # by checking for these keys ('_meta' and 'hostvars' exist) - if results.has_key('_meta') and results['_meta'].has_key('hostvars'): - for data in results['_meta']['hostvars'].values(): - data[str(new_var)] = str(value) - - # Add this group - if results.has_key(acc_config['all_group']): - results["%s_%s" % (new_var, value)] = \ - copy.copy(results[acc_config['all_group']]) + # Update each hostvar with the newly desired key: value from extra_* + for _extra in ['extra_groups', 'extra_vars']: + for new_var, value in acc_config.get(_extra, {}).items(): + # Verify the account results look sane + # by checking for these keys ('_meta' and 'hostvars' exist) + if results.has_key('_meta') and results['_meta'].has_key('hostvars'): + for data in results['_meta']['hostvars'].values(): + data[str(new_var)] = str(value) + + # Add this group + if _extra == 'extra_groups' and results.has_key(acc_config['all_group']): + results["%s_%s" % (new_var, value)] = \ + copy.copy(results[acc_config['all_group']]) # Clone groups goes here - for name_from, name_to in acc_config.get('clone_groups', {}).items(): - if results.has_key(name_from): - results[name_to] = copy.copy(results[name_from]) + for to_name, from_name in acc_config.get('clone_groups', {}).items(): + if results.has_key(from_name): + results[to_name] = copy.copy(results[from_name]) # Clone vars goes here for to_name, from_name in acc_config.get('clone_vars', {}).items(): -- cgit v1.2.3 From 417745e0d3304e486f45df84acdef34f17b24cb1 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Thu, 29 Oct 2015 16:01:50 -0400 Subject: Automatic commit of package [openshift-ansible] release [3.0.5-1]. --- .tito/packages/openshift-ansible | 2 +- openshift-ansible.spec | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index a5750f1ac..1a77715d2 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.4-1 ./ +3.0.5-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index a5f25d966..a9e0fbde6 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.4 +Version: 3.0.5 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -225,6 +225,20 @@ Atomic OpenShift Utilities includes %changelog +* Thu Oct 29 2015 Kenny Woodson 3.0.5-1 +- Updating multi_ec2 to support extra_vars and extra_groups + (kwoodson@redhat.com) +- Removing the template and doing to_nice_yaml instead (kwoodson@redhat.com) +- README_AEP.md: update instructions for creating router and registry + (jlebon@redhat.com) +- README_AEP: Various fixes (walters@verbum.org) +- Fixing for extra_vars rename. (kwoodson@redhat.com) +- make storage_plugin_deps conditional on deployment_type (jdetiber@redhat.com) +- remove debugging pauses (jdetiber@redhat.com) +- make storage plugin dependency installation more flexible + (jdetiber@redhat.com) +- Install storage plugin dependencies (jdetiber@redhat.com) + * Wed Oct 28 2015 Kenny Woodson 3.0.4-1 - Removing spec files. (kwoodson@redhat.com) - Updated example (kwoodson@redhat.com) -- cgit v1.2.3 From 00521b2a5cccff48a3cedd70d4add267bf92d14e Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Fri, 30 Oct 2015 09:43:03 -0400 Subject: Use more specific enterprise version for version_greater_than_3_1_or_1_1. --- roles/openshift_facts/library/openshift_facts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From e76fdccf15bcdb26823598224cdb0aa8772ba41b Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Fri, 30 Oct 2015 11:22:53 -0400 Subject: Adding python-boto and python-libcloud to openshift-ansible-inventory dependency --- openshift-ansible.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ansible.spec b/openshift-ansible.spec index a9e0fbde6..1fe379bb0 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -128,7 +128,7 @@ BuildArch: noarch # ---------------------------------------------------------------------------------- %package inventory Summary: Openshift and Atomic Enterprise Ansible Inventories -Requires: python2 +Requires: python2, python-boto, python-libcloud >= 0.13 BuildArch: noarch %description inventory -- cgit v1.2.3 From 01ebae72262cdc978a1d7eb248d52a3260c18972 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Fri, 30 Oct 2015 11:27:04 -0400 Subject: Automatic commit of package [openshift-ansible] release [3.0.6-1]. --- .tito/packages/openshift-ansible | 2 +- openshift-ansible.spec | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 1a77715d2..92f545b25 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.5-1 ./ +3.0.6-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 1fe379bb0..b905edaf8 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -225,6 +225,13 @@ Atomic OpenShift Utilities includes %changelog +* Fri Oct 30 2015 Kenny Woodson 3.0.6-1 +- Adding python-boto and python-libcloud to openshift-ansible-inventory + dependency (kwoodson@redhat.com) +- Use more specific enterprise version for version_greater_than_3_1_or_1_1. + (abutcher@redhat.com) +- Conditionalizing the support for the v1beta3 api (bleanhar@redhat.com) + * Thu Oct 29 2015 Kenny Woodson 3.0.5-1 - Updating multi_ec2 to support extra_vars and extra_groups (kwoodson@redhat.com) -- cgit v1.2.3 From e0fd136c9ae77115cc80f487aac44f066492e494 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Fri, 30 Oct 2015 14:15:49 -0400 Subject: Attempt to remove the various interfaces left over from an install Removing br0 won't work if openvswitch has already been stopped. ovs-system will be left around but that is just a problem with openvswitch's packaging. That device is apparently not even used. In the worst case a manual reboot will remove all of these devices. --- playbooks/adhoc/uninstall.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 7d1544be8..0503b7cd4 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -22,6 +22,11 @@ - set_fact: is_atomic: "{{ ostree_output.rc == 0 }}" + - name: Remove br0 interface + shell: ovs-vsctl del-br br0 + changed_when: False + failed_when: False + - service: name={{ item }} state=stopped with_items: - atomic-enterprise-master @@ -69,6 +74,15 @@ - tuned-profiles-openshift-node - tuned-profiles-origin-node + - name: Remove linux interfaces + shell: ip link del "{{ item }}" + changed_when: False + failed_when: False + with_items: + - lbr0 + - vlinuxbr + - vovsbr + - shell: systemctl reset-failed changed_when: False -- cgit v1.2.3 From 4eb8cd34bef062b3b9e0f86d221f85d9c69bfcd3 Mon Sep 17 00:00:00 2001 From: Matt Woodson Date: Mon, 2 Nov 2015 11:59:21 -0500 Subject: changed the cpu alert to only alert if cpu idle more than 5x. Change alert to warning --- roles/os_zabbix/vars/template_os_linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index 69432273f..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: high + 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}' -- cgit v1.2.3 From 6c51d3181a003e99fba48bdfdb016d7b4a0bb8c0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 2 Nov 2015 11:12:30 -0600 Subject: split inventory into subpackages --- openshift-ansible.spec | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/openshift-ansible.spec b/openshift-ansible.spec index b905edaf8..8d79c80c6 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -128,7 +128,7 @@ BuildArch: noarch # ---------------------------------------------------------------------------------- %package inventory Summary: Openshift and Atomic Enterprise Ansible Inventories -Requires: python2, python-boto, python-libcloud >= 0.13 +Requires: python2 BuildArch: noarch %description inventory @@ -138,7 +138,29 @@ Ansible Inventories used with the openshift-ansible scripts and playbooks. %config(noreplace) /etc/ansible/* %dir %{_datadir}/ansible/inventory %{_datadir}/ansible/inventory/multi_ec2.py* + +%package inventory-aws +Summary: Openshift and Atomic Enterprise Ansible Inventories for AWS +Requires: %{name}-inventory +Requires: python-boto +BuildArch: noarch + +%description inventory-aws +Ansible Inventories for AWS used with the openshift-ansible scripts and playbooks. + +%files inventory-aws %{_datadir}/ansible/inventory/aws/ec2.py* + +%package inventory-gce +Summary: Openshift and Atomic Enterprise Ansible Inventories for GCE +Requires: %{name}-inventory +Requires: python-libcloud >= 0.13 +BuildArch: noarch + +%description inventory-gce +Ansible Inventories for GCE used with the openshift-ansible scripts and playbooks. + +%files inventory-gce %{_datadir}/ansible/inventory/gce/gce.py* -- cgit v1.2.3