summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4193 from ashcrow/1448998Scott Dodson2017-05-152-8/+8
|\ | | | | byo inventory versions 3.5 -> 3.6
| * byo inventory versions 1.5 -> 3.6Steve Milner2017-05-151-4/+4
| |
| * byo inventory versions 3.5 -> 3.6Steve Milner2017-05-151-4/+4
|/
* Merge pull request #4184 from ashcrow/rslaveOpenShift Bot2017-05-142-12/+16
|\ | | | | Merged by openshift-bot
| * Add docker package for container-engine installSteve Milner2017-05-142-12/+16
|/ | | | | The package is required so that openshift_facts is able to use the docker client to gain information on the versions.
* Automatic commit of package [openshift-ansible] release [3.6.68-1].Jenkins CD Merge Bot2017-05-132-2/+50
| | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* Merge pull request #4113 from ↵OpenShift Bot2017-05-133-14/+6
|\ | | | | | | | | jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum Merged by openshift-bot
| * bug 1448860. Change recovery_after_nodes to match node_quorumJeff Cantrill2017-05-113-14/+6
| |
* | Merge pull request #4155 from ewolinetz/registry_console_upgradeOpenShift Bot2017-05-131-0/+22
|\ \ | | | | | | Merged by openshift-bot
| * | Updating registry-console image version during a post_control_plane upgradeewolinetz2017-05-121-0/+22
| | |
* | | Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | This flag is currently being set within the system container via the init.sh
* | | | Merge pull request #4172 from ashcrow/1450307OpenShift Bot2017-05-123-12/+10
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
| | | | |
| * | | | Always add proxy items to atomic.confSteve Milner2017-05-121-4/+1
| | | | |
| * | | | Move container-engine systemd environment to updated locationSteve Milner2017-05-122-2/+3
| |/ / /
* | | | Merge pull request #4030 from liggitt/reserved-namespacesOpenShift Bot2017-05-122-0/+4
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Reserve kubernetes and 'kubernetes-' prefixed namespacesJordan Liggitt2017-04-272-0/+4
| | | | |
* | | | | Merge pull request #4162 from jcantrill/bz1439451_kibana_crashOpenShift Bot2017-05-122-10/+33
|\ \ \ \ \ | |_|/ / / |/| | | | Merged by openshift-bot
| * | | | bug 1441369. Kibana memory limitsJeff Cantrill2017-05-112-10/+33
| | |_|/ | |/| | | | | | | | | | | | | | | | | | bug 1439451. Kibana crash (cherry picked from commit 66315ebbfcfda72d6f501c441359d92ec71af7d2)
* | | | Merge pull request #4126 from VincentS/SDN_Check_FixJan Chaloupka2017-05-121-1/+1
|\ \ \ \ | | | | | | | | | | Fix for OpenShift SDN Check
| * | | | Fix for OpenShift SDN CheckVincent Schwarzer2017-05-091-1/+1
| | | | |
* | | | | Merge pull request #4065 from ingvagabund/introduce-get-rpm-version-roleJan Chaloupka2017-05-1213-67/+106
|\ \ \ \ \ | | | | | | | | | | | | Introduce excluder-free rpm version detection role
| * | | | | Extend repoquery command (of lib_utils role) to ignore excludersJan Chaloupka2017-05-1113-67/+106
| | | | | |
* | | | | | Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-onlyJan Chaloupka2017-05-1221-54/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | run excluders over selected set of hosts during control_plane/node upgrade
| * | | | | | run excluders over selected set of hosts during control_plane/node upgradeJan Chaloupka2017-05-0321-54/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable/reset excluders over requested hosts
* | | | | | | Merge pull request #4164 from ashcrow/simplify-daemon-jsonOpenShift Bot2017-05-112-45/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | doc: Add link to daemon.json upstream docSteve Milner2017-05-111-0/+2
| | | | | | | |
| * | | | | | | Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
* | | | | | | | Merge pull request #4115 from ewolinetz/metrics_limits_docsOpenShift Bot2017-05-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Updating size suffix for metrics in roleewolinetz2017-05-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #4153 from ewolinetz/bz1449554OpenShift Bot2017-05-111-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Updating 3.6 enterprise registry-console template image versionewolinetz2017-05-101-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4158 from ganhuang/lower_boolScott Dodson2017-05-111-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | lower case in /etc/daemon.json and correct block-registry
| * | | | | | | lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #4156 from mwoodson/fix_yedit_sepsOpenShift Bot2017-05-1129-29/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Fix for yedit custom separatorsMatt Woodson2017-05-1029-29/+29
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-104-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Default to iptables on masterScott Dodson2017-05-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did this in 3.5 but never on master and we never came back to add migration support. So we'll revert this on master and if/when we add migration support we'll switch the default.
* | | | | | | | | Merge pull request #4118 from mtnbikenc/fix-groupsOpenShift Bot2017-05-103-4/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Temporarily revert to OSEv3 host group usageRussell Teague2017-05-093-4/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #4131 from ashcrow/1448800Scott Dodson2017-05-1020-48/+152
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update systemd units to use proper container service name
| * | | | | | | | | Add service file templates for master and nodeSteve Milner2017-05-096-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds service file templates for both maste and node. These will lay down in /etc/system/systemd to override what may already be present from a package. These instances take into account the name of the container daemon (docker or container-engine).
| * | | | | | | | | Update systemd units to use proper container service nameSteve Milner2017-05-0914-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If using a system container: container-engine - If using a package install: docker Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1448800
* | | | | | | | | | Merge pull request #4147 from ashcrow/lowercase-trueScott Dodson2017-05-102-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ensure true is lowercase in daemon.json
| * | | | | | | | | | Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries.
| * | | | | | | | | | Ensure true is lowercase in daemon.jsonSteve Milner2017-05-102-1/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3967 from jarrpa/oc_volume-docOpenShift Bot2017-05-102-0/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | oc_volume: Add missing parameter documentationJose A. Rivera2017-04-212-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | | | Merge pull request #4136 from richm/find-log-driverScott Dodson2017-05-102-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | use docker_log_driver and /etc/docker/daemon.json to determine log driver