Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Test docker restart with retries 3 delay 30 | Steve Milner | 2017-07-18 | 9 | -2/+30 |
| | |||||
* | Merge pull request #4780 from derekwaynecarr/fix-example | Scott Dodson | 2017-07-18 | 2 | -2/+2 |
|\ | | | | | Update image-gc-high-threshold value | ||||
| * | Update image-gc-high-threshold value | Derek Carr | 2017-07-18 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #4764 from sdodson/ansible-2-3 | OpenShift Bot | 2017-07-18 | 2 | -7/+2 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Switch CI to ansible-2.3.1.0 | Scott Dodson | 2017-07-17 | 2 | -7/+2 |
| | | |||||
* | | Merge pull request #4758 from ↵ | Rodolfo Carvalho | 2017-07-18 | 4 | -85/+114 |
|\ \ | | | | | | | | | | | | | rhcarvalho/bz1465882-package_version-ovs2.7-on-ocp3.6 Allow Open vSwitch 2.7 on OpenShift 3.5 and 3.6 | ||||
| * | | Allow OVS 2.7 in latest OpenShift releases | Rodolfo Carvalho | 2017-07-17 | 2 | -32/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the package_version check to tolerate either Open vSwitch 2.6 or 2.7. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1465882 This commit removes a unit test that adds no coverage and tests data instead of logic. This coupling makes every change to supported versions require the same changes to the tests. | ||||
| * | | Make aos_version module handle multiple versions | Rodolfo Carvalho | 2017-07-17 | 2 | -24/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | Some packages are supported at more than one major.minor version at the same time. Support is added keeping backward compatibility: the 'version' key can be either a string (single version) or a list of versions. | ||||
| * | | Split positive and negative unit tests | Rodolfo Carvalho | 2017-07-17 | 1 | -50/+40 |
| |/ | | | | | | | | | | | | | Split positive and negative tests into their own functions. This means less lines of code, clearer purpose, easier to understand what each test does or doesn't and to add new test cases. | ||||
* | | Automatic commit of package [openshift-ansible] release [3.6.153-1]. | Jenkins CD Merge Bot | 2017-07-18 | 2 | -2/+16 |
| | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.153 | ||||
* | | Merge pull request #4762 from tbielawa/bz1470165_bz1468424 | OpenShift Bot | 2017-07-18 | 3 | -34/+87 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Other playbooks maybe expecting this to be at least an empty string. I think ↵ | Tim Bielawa | 2017-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | they default it to an empty list if its not found. | ||||
| * | | Fix NO_PROXY environment variable setting | Tim Bielawa | 2017-07-17 | 3 | -34/+86 |
| |/ | |||||
* | | Merge pull request #4772 from ewolinetz/fix_additive_clusterrole | Scott Dodson | 2017-07-17 | 3 | -3/+37 |
|\ \ | | | | | | | Updating to use oc replace and conditionally update edit and admin roles | ||||
| * | | Updating to compare sets instead of sorted lists | ewolinetz | 2017-07-17 | 2 | -8/+10 |
| | | | |||||
| * | | Adding ability to create podpreset for service-catalog-controller for bz1471881 | ewolinetz | 2017-07-17 | 1 | -0/+6 |
| | | | |||||
| * | | Updating to use oc replace and conditionally update edit and admin roles | ewolinetz | 2017-07-17 | 2 | -3/+29 |
| |/ | |||||
* | | Merge pull request #4594 from kwoodson/encryption | OpenShift Bot | 2017-07-17 | 3 | -1/+18 |
|\ \ | |/ |/| | Merged by openshift-bot | ||||
| * | Merge branch 'master' into encryption | Kenny Woodson | 2017-07-05 | 383 | -2291/+35801 |
| |\ | |||||
| * | | Changing the passing of data for sc creation. | Kenny Woodson | 2017-06-30 | 2 | -11/+9 |
| | | | |||||
| * | | Fixed variable name. | Kenny Woodson | 2017-06-29 | 2 | -2/+3 |
| | | | |||||
| * | | Adding disk encryption to storageclasses and to openshift registry | Kenny Woodson | 2017-06-29 | 6 | -8/+33 |
| | | | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.152-1]. | Jenkins CD Merge Bot | 2017-07-17 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.152 | ||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.151-1]. | Jenkins CD Merge Bot | 2017-07-16 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.151 | ||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.150-1]. | Jenkins CD Merge Bot | 2017-07-16 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.150 | ||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.149-1]. | Jenkins CD Merge Bot | 2017-07-15 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.149 | ||||
* | | | Merge pull request #4751 from jkaurredhat/redeploy-1.6 | OpenShift Bot | 2017-07-14 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Config was missed before replace. | jkaurredhat | 2017-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: jkaurredhat <jkaur@redhat.com> | ||||
| * | | | Redeploy-certificates will fail for registry and router if user is not ↵ | jkaurredhat | 2017-07-13 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | system:admin Signed-off-by: jkaurredhat <jkaur@redhat.com> | ||||
* | | | | Automatic commit of package [openshift-ansible] release [3.6.148-1]. | Jenkins CD Merge Bot | 2017-07-14 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.148 | ||||
* | | | | Merge pull request #4765 from ewolinetz/service_catalog_console_roles | Scott Dodson | 2017-07-14 | 2 | -0/+60 |
|\ \ \ \ | | | | | | | | | | | Adding in permissions to edit and admin cluster roles | ||||
| * | | | | Adding in permissions to edit and admin cluster roles | ewolinetz | 2017-07-14 | 2 | -0/+60 |
| | | | | | |||||
* | | | | | Merge pull request #4750 from jkaurredhat/drain_upgrade1.6 | Scott Dodson | 2017-07-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Upgrade fails when "Drain Node for Kubelet upgrade" | ||||
| * | | | | | Upgrade fails when "Drain Node for Kubelet upgrade" | jkaurredhat | 2017-07-13 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes : https://bugzilla.redhat.com/show_bug.cgi?id=1468572 Signed-off-by: jkaurredhat <jkaur@redhat.com> | ||||
* | | | | | Merge pull request #4540 from ↵ | Scott Dodson | 2017-07-14 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | giuseppe/openvswitch-syscontainer-specify-docker-service-name openvswitch, syscontainer: specify the Docker service name | ||||
| * | | | | openvswitch, syscontainer: specify the Docker service name | Giuseppe Scrivano | 2017-06-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | Merge pull request #4756 from ewolinetz/bz1469368 | Scott Dodson | 2017-07-13 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | making kube-service-catalog project network global when using redhat/… | ||||
| * | | | | | making kube-service-catalog project network global when using ↵ | ewolinetz | 2017-07-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | redhat/openshift-ovs-multitenant plugin | ||||
* | | | | | | Merge pull request #4755 from ↵ | Scott Dodson | 2017-07-13 | 2 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | ingvagabund/set-killmode-to-process-in-node-service-file set KillMode to process in node service file | ||||
| * | | | | | set KillMode to process in node service file | Jan Chaloupka | 2017-07-13 | 2 | -0/+2 |
|/ / / / / | |||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.144-1]. | Jenkins CD Merge Bot | 2017-07-13 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.144 | ||||
* | | | | | Merge pull request #4743 from ewolinetz/bz1469986 | Scott Dodson | 2017-07-12 | 2 | -0/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Created js file for enabling tech preview for console, updated master… | ||||
| * | | | | | Created js file for enabling tech preview for console, updated master-config ↵ | ewolinetz | 2017-07-12 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | for pod presets and console tech preview | ||||
* | | | | | | Merge pull request #4720 from jarrpa/glusterfs-fixes-four | Scott Dodson | 2017-07-12 | 13 | -2/+221 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | GlusterFS Fixes 4 | ||||
| * | | | | | | GlusterFS: Add updated example hosts files | Jose A. Rivera | 2017-07-08 | 3 | -0/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | | | | GlusterFS: Fix SSH-based heketi configuration | Jose A. Rivera | 2017-07-08 | 10 | -2/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.143-1]. | Jenkins CD Merge Bot | 2017-07-12 | 2 | -2/+5 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.143 | ||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.142-1]. | Jenkins CD Merge Bot | 2017-07-12 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.142 | ||||
* | | | | | | Merge pull request #4737 from sosiouxme/20170711-consolidate-small-prs | OpenShift Bot | 2017-07-12 | 10 | -16/+67 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | add scheduled pods check | juanvallejo | 2017-07-11 | 2 | -2/+32 |
| | | | | | | |