summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test docker restart with retries 3 delay 30Steve Milner2017-07-189-2/+30
|
* Merge pull request #4780 from derekwaynecarr/fix-exampleScott Dodson2017-07-182-2/+2
|\ | | | | Update image-gc-high-threshold value
| * Update image-gc-high-threshold valueDerek Carr2017-07-182-2/+2
|/
* Merge pull request #4764 from sdodson/ansible-2-3OpenShift Bot2017-07-182-7/+2
|\ | | | | Merged by openshift-bot
| * Switch CI to ansible-2.3.1.0Scott Dodson2017-07-172-7/+2
| |
* | Merge pull request #4758 from ↵Rodolfo Carvalho2017-07-184-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 releasesRodolfo Carvalho2017-07-172-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 versionsRodolfo Carvalho2017-07-172-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 testsRodolfo Carvalho2017-07-171-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 Bot2017-07-182-2/+16
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.153
* | Merge pull request #4762 from tbielawa/bz1470165_bz1468424OpenShift Bot2017-07-183-34/+87
|\ \ | | | | | | Merged by openshift-bot
| * | Other playbooks maybe expecting this to be at least an empty string. I think ↵Tim Bielawa2017-07-171-0/+1
| | | | | | | | | | | | they default it to an empty list if its not found.
| * | Fix NO_PROXY environment variable settingTim Bielawa2017-07-173-34/+86
| |/
* | Merge pull request #4772 from ewolinetz/fix_additive_clusterroleScott Dodson2017-07-173-3/+37
|\ \ | | | | | | Updating to use oc replace and conditionally update edit and admin roles
| * | Updating to compare sets instead of sorted listsewolinetz2017-07-172-8/+10
| | |
| * | Adding ability to create podpreset for service-catalog-controller for bz1471881ewolinetz2017-07-171-0/+6
| | |
| * | Updating to use oc replace and conditionally update edit and admin rolesewolinetz2017-07-172-3/+29
| |/
* | Merge pull request #4594 from kwoodson/encryptionOpenShift Bot2017-07-173-1/+18
|\ \ | |/ |/| Merged by openshift-bot
| * Merge branch 'master' into encryptionKenny Woodson2017-07-05383-2291/+35801
| |\
| * | Changing the passing of data for sc creation.Kenny Woodson2017-06-302-11/+9
| | |
| * | Fixed variable name.Kenny Woodson2017-06-292-2/+3
| | |
| * | Adding disk encryption to storageclasses and to openshift registryKenny Woodson2017-06-296-8/+33
| | |
* | | Automatic commit of package [openshift-ansible] release [3.6.152-1].Jenkins CD Merge Bot2017-07-172-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 Bot2017-07-162-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 Bot2017-07-162-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 Bot2017-07-152-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.6OpenShift Bot2017-07-142-1/+3
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Config was missed before replace.jkaurredhat2017-07-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: jkaurredhat <jkaur@redhat.com>
| * | | Redeploy-certificates will fail for registry and router if user is not ↵jkaurredhat2017-07-132-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 Bot2017-07-142-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_rolesScott Dodson2017-07-142-0/+60
|\ \ \ \ | | | | | | | | | | Adding in permissions to edit and admin cluster roles
| * | | | Adding in permissions to edit and admin cluster rolesewolinetz2017-07-142-0/+60
| | | | |
* | | | | Merge pull request #4750 from jkaurredhat/drain_upgrade1.6Scott Dodson2017-07-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Upgrade fails when "Drain Node for Kubelet upgrade"
| * | | | | Upgrade fails when "Drain Node for Kubelet upgrade"jkaurredhat2017-07-131-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 Dodson2017-07-141-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | giuseppe/openvswitch-syscontainer-specify-docker-service-name openvswitch, syscontainer: specify the Docker service name
| * | | | openvswitch, syscontainer: specify the Docker service nameGiuseppe Scrivano2017-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #4756 from ewolinetz/bz1469368Scott Dodson2017-07-131-0/+5
|\ \ \ \ \ | | | | | | | | | | | | making kube-service-catalog project network global when using redhat/…
| * | | | | making kube-service-catalog project network global when using ↵ewolinetz2017-07-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | redhat/openshift-ovs-multitenant plugin
* | | | | | Merge pull request #4755 from ↵Scott Dodson2017-07-132-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 fileJan Chaloupka2017-07-132-0/+2
|/ / / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.6.144-1].Jenkins CD Merge Bot2017-07-132-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.144
* | | | | Merge pull request #4743 from ewolinetz/bz1469986Scott Dodson2017-07-122-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 ↵ewolinetz2017-07-122-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | for pod presets and console tech preview
* | | | | | Merge pull request #4720 from jarrpa/glusterfs-fixes-fourScott Dodson2017-07-1213-2/+221
|\ \ \ \ \ \ | | | | | | | | | | | | | | GlusterFS Fixes 4
| * | | | | | GlusterFS: Add updated example hosts filesJose A. Rivera2017-07-083-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | GlusterFS: Fix SSH-based heketi configurationJose A. Rivera2017-07-0810-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 Bot2017-07-122-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 Bot2017-07-122-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-prsOpenShift Bot2017-07-1210-16/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | add scheduled pods checkjuanvallejo2017-07-112-2/+32
| | | | | | |