summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5556 from vshn/aliastypo1Scott Dodson2017-09-271-1/+1
|\
| * Fix typo in drop_etcdctl.ymlMichael Hanselmann2017-09-271-1/+1
* | Merge pull request #5555 from mtnbikenc/fix-filter-loadingScott Dodson2017-09-274-0/+0
|\ \ | |/ |/|
| * Rename filter_plugins to unique namesRussell Teague2017-09-274-0/+0
* | Merge pull request #5546 from ewolinetz/bz1495203OpenShift Merge Robot2017-09-271-2/+2
|\ \
| * | Adding default for volume size if not setEric Wolinetz2017-09-261-2/+2
* | | Merge pull request #4973 from wozniakjan/logging_eventrouterOpenShift Merge Robot2017-09-2712-2/+374
|\ \ \
| * | | logging: introducing event routerJan Wozniak2017-09-2612-2/+374
* | | | Merge pull request #5532 from mgugino-upstream-stage/centos-ami-provisionScott Dodson2017-09-272-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | More variables in AWS provisioning playsMichael Gugino2017-09-262-1/+2
* | | | Merge pull request #5533 from mgugino-upstream-stage/configure-network-managerOpenShift Merge Robot2017-09-272-0/+10
|\ \ \ \
| * | | | Support installation of NetworkManager for provisioned nodesMichael Gugino2017-09-262-0/+10
* | | | | Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memoryOpenShift Merge Robot2017-09-261-2/+2
|\ \ \ \ \
| * | | | | logging: fix kibana and kibana-ops defaultsJan Wozniak2017-09-251-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #5470 from ingvagabund/consolidate-etcd-common-roleOpenShift Merge Robot2017-09-2635-179/+198
|\ \ \ \ \
| * | | | | consolidate etcd_common roleJan Chaloupka2017-09-2535-179/+198
* | | | | | Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot2017-09-262-0/+4
|\ \ \ \ \ \
| * | | | | | Fluentd: one output tag, one output pluginNoriko Hosoi2017-09-252-0/+4
* | | | | | | Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot2017-09-261-4/+16
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz2017-09-251-4/+16
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot2017-09-261-11/+29
|\ \ \ \ \ \
| * | | | | | Generate aggregator api client config in temporary directory.Andrew Butcher2017-09-251-11/+29
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot2017-09-263-4/+10
|\ \ \ \ \ \
| * | | | | | Passing in image parameter for tsb templateEric Wolinetz2017-09-253-4/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot2017-09-2620-173/+161
|\ \ \ \ \ \
| * | | | | | Refactor openshift_hosted plays and roleMichael Gugino2017-09-2520-173/+161
* | | | | | | Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot2017-09-265-6/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove logging ES_COPY featureJeff Cantrill2017-09-225-6/+3
* | | | | | | | Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot2017-09-262-5/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | crio: detect the correct version of the imagesGiuseppe Scrivano2017-09-251-4/+7
| * | | | | | | crio: set the correct image name with OSEGiuseppe Scrivano2017-09-251-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot2017-09-254-19/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Changes for Nuage atomic ansible installRohan Parulekar2017-09-204-19/+5
* | | | | | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot2017-09-255-11/+71
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-215-11/+71
* | | | | | | Merge pull request #5415 from ttindell2/masterOpenShift Merge Robot2017-09-254-39/+48
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | GlusterFS can now be run more than once. Ability to add devices to nodesTim Tindell2017-09-184-39/+48
* | | | | | | Merge pull request #5451 from ingvagabund/consolidate-etcd-upgradeOpenShift Merge Robot2017-09-2510-49/+15
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | consolidate etcd_upgrade roleJan Chaloupka2017-09-2110-49/+15
* | | | | | | Merge pull request #5492 from jsafrane/local-storage-predicateOpenShift Merge Robot2017-09-252-1/+32
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add 3.7 scheduler predicatesJan Safranek2017-09-202-1/+32
| |/ / / / /
* | | | | | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot2017-09-241-0/+1
|\ \ \ \ \ \
| * | | | | | crio: skip installation on lbs and nfs nodesGiuseppe Scrivano2017-09-221-0/+1
* | | | | | | Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fixOpenShift Merge Robot2017-09-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed AnsibleUnsafeText by converting to intEduardo Minguez2017-09-211-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #5502 from mgugino-upstream-stage/fix-undefined-reg-authOpenShift Merge Robot2017-09-2310-26/+80
|\ \ \ \ \ \ \
| * | | | | | | Fix registry_auth logic for upgradesMichael Gugino2017-09-2210-26/+80
* | | | | | | | Merge pull request #5460 from ingvagabund/consolidate-etcd-migrate-roleOpenShift Merge Robot2017-09-2317-98/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | consolidate etcd_migrate roleJan Chaloupka2017-09-2217-98/+12
* | | | | | | | | Merge pull request #5384 from joelddiaz/node-fact-filterOpenShift Merge Robot2017-09-232-1/+33
|\ \ \ \ \ \ \ \ \