summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4164 from ashcrow/simplify-daemon-jsonOpenShift Bot2017-05-112-45/+2
|\
| * doc: Add link to daemon.json upstream docSteve Milner2017-05-111-0/+2
| * Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
* | Merge pull request #4115 from ewolinetz/metrics_limits_docsOpenShift Bot2017-05-111-1/+1
|\ \
| * | Updating size suffix for metrics in roleewolinetz2017-05-081-1/+1
* | | Merge pull request #4153 from ewolinetz/bz1449554OpenShift Bot2017-05-111-2/+2
|\ \ \ | |_|/ |/| |
| * | 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-registryGan Huang2017-05-111-2/+2
* | | | Merge pull request #4156 from mwoodson/fix_yedit_sepsOpenShift Bot2017-05-1129-29/+29
|\ \ \ \
| * | | | Fix for yedit custom separatorsMatt Woodson2017-05-1029-29/+29
| | |/ / | |/| |
* | | | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-104-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Default to iptables on masterScott Dodson2017-05-104-4/+4
* | | | Merge pull request #4131 from ashcrow/1448800Scott Dodson2017-05-1020-48/+152
|\ \ \ \
| * | | | Add service file templates for master and nodeSteve Milner2017-05-096-1/+105
| * | | | Update systemd units to use proper container service nameSteve Milner2017-05-0914-47/+47
* | | | | Merge pull request #4147 from ashcrow/lowercase-trueScott Dodson2017-05-102-2/+3
|\ \ \ \ \
| * | | | | Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
| * | | | | 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
|\ \ \ \ \
| * | | | | oc_volume: Add missing parameter documentationJose A. Rivera2017-04-212-0/+24
* | | | | | 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 driverRich Megginson2017-05-092-1/+7
* | | | | | Merge pull request #4109 from ewolinetz/fix_ocobj_absentOpenShift Bot2017-05-102-2/+2
|\ \ \ \ \ \
| * | | | | | Updating oc_obj to use get instead of getattrewolinetz2017-05-082-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4124 from ingvagabund/update-etcd-common-readmeOpenShift Bot2017-05-101-9/+28
|\ \ \ \ \ \
| * | | | | | polish etcd_common roleJan Chaloupka2017-05-091-9/+28
* | | | | | | Merge pull request #3969 from jarrpa/glusterfs-registry-tooOpenShift Bot2017-05-1015-225/+380
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | GlusterFS: Allow swapping an existing registry's backend storageJose A. Rivera2017-05-046-3/+53
| * | | | | | GlusterFS: Allow for a separate registry-specific playbookJose A. Rivera2017-05-0411-220/+308
| * | | | | | GlusterFS: Improve role documentationJose A. Rivera2017-05-041-1/+10
| * | | | | | hosted_registry: Get correct pod selector for GlusterFS storageJose A. Rivera2017-05-041-1/+9
| * | | | | | hosted registry: Fix typoJose A. Rivera2017-05-041-1/+1
* | | | | | | Merge pull request #4033 from ingvagabund/report-docker-image-version-and-exc...Jan Chaloupka2017-05-103-40/+58
|\ \ \ \ \ \ \
| * | | | | | | Fail if rpm version != docker image versionJan Chaloupka2017-05-093-40/+58
* | | | | | | | Merge pull request #4116 from abutcher/bz1448824Jan Chaloupka2017-05-101-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix additional master cert & client config creation.Andrew Butcher2017-05-081-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #4123 from rhcarvalho/remove-vim-lineRodolfo Carvalho2017-05-109-10/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove vim configuration from Python filesRodolfo Carvalho2017-05-099-10/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #4106 from ashcrow/1448384OpenShift Bot2017-05-092-6/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
| |/ / / / /
* | | | | | Merge pull request #4026 from ewolinetz/cherry_picks_15OpenShift Bot2017-05-087-13/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updating logging and metrics to restart api, ha and controllers when updating...ewolinetz2017-04-285-6/+30
| * | | | | Adding defaults for es_indicesewolinetz2017-04-271-2/+2
| * | | | | Updating logic for generating pvcs and their counts to prevent reuse when loo...ewolinetz2017-04-272-7/+21
* | | | | | Merge pull request #4103 from ganhuang/fix_container_engineOpenShift Bot2017-05-056-24/+27
|\ \ \ \ \ \
| * | | | | | Fix 1448368, and some other minors issuesGan Huang2017-05-056-24/+27
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4093 from richm/mux-result-startup-fixScott Dodson2017-05-052-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | mux startup is broken without this fixRich Megginson2017-05-042-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-commonJan Chaloupka2017-05-043-1/+3
|\ \ \ \ \