summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Fix tests on Python 3Rodolfo Carvalho2017-02-192-2/+2
* Merge pull request #3412 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-192-34/+0
|\
| * Remove dead codeRodolfo Carvalho2017-02-182-34/+0
* | Merge pull request #3411 from kwoodson/oc_route_remove_debugKenny Woodson2017-02-182-2/+2
|\ \ | |/ |/|
| * Fixing a bug by removing default debugKenny Woodson2017-02-172-2/+2
* | Merge pull request #3402 from cgwalters/fedora-python3Scott Dodson2017-02-171-0/+12
|\ \ | |/ |/|
| * facts/main: Require Python 3 for Fedora, Python 2 everywhere elseColin Walters2017-02-171-0/+12
* | Merge pull request #3403 from kwoodson/lib_openshift_compatScott Dodson2017-02-1714-14/+14
|\ \
| * | String compatibility for python2,3Kenny Woodson2017-02-1714-14/+14
* | | Merge pull request #3399 from mtnbikenc/deprecationRussell Teague2017-02-171-1/+1
|\ \ \ | |/ / |/| |
| * | Resolve deprecation warningRussell Teague2017-02-171-1/+1
* | | Merge pull request #3369 from ashcrow/attach-cloudfrontScott Dodson2017-02-173-11/+25
|\ \ \ | |/ / |/| |
| * | Register cloudfront privkey when requiredSteve Milner2017-02-163-11/+25
* | | Don't attempt to install python-ruamel-yaml on atomicScott Dodson2017-02-162-0/+12
* | | Merge pull request #3383 from kwoodson/yedit_yaml_supportScott Dodson2017-02-1621-315/+929
|\ \ \
| * | | Pleasing the linting gods.Kenny Woodson2017-02-1619-81/+213
| * | | Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load.Kenny Woodson2017-02-1618-95/+297
| * | | Adding fallback support for pyyaml.Kenny Woodson2017-02-1618-205/+485
| | |/ | |/|
* | | Merge pull request #3386 from bparees/bump_templatesScott Dodson2017-02-169-10/+37
|\ \ \
| * | | update example templates+imagestreamsBen Parees2017-02-169-10/+37
| |/ /
* | | Merge pull request #3370 from adbaldi/workScott Dodson2017-02-161-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging)Andrew Baldi2017-02-151-1/+1
| |/
* | Merge pull request #3381 from jcantrill/bz_1420217_default_es_memoryEric Wolinetz2017-02-161-2/+2
|\ \
| * | bug 1420217. Default ES memory to be compariable to 3.4 deployerJeff Cantrill2017-02-161-2/+2
* | | Merge pull request #3374 from mwringe/hawkular-metrics-certificatesScott Dodson2017-02-162-2/+2
|\ \ \
| * | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060)mwringe2017-02-152-2/+2
| |/ /
* | | Merge pull request #3375 from abutcher/revert-openshift-facts-skipScott Dodson2017-02-161-60/+46
|\ \ \
| * | | Revert "Add block+when skip to `openshift_facts` tasks"Andrew Butcher2017-02-151-60/+46
| |/ /
* | | adding some quotes for safetyewolinetz2017-02-151-1/+1
* | | fixing use of oc_scale moduleewolinetz2017-02-152-2/+2
* | | fixing default for loggingewolinetz2017-02-151-3/+3
|/ /
* | Merge pull request #3364 from detiber/lintCleanupScott Dodson2017-02-155-8/+596
|\ \ | |/ |/|
| * Ansible Lint cleanup and making filter/lookup plugins used by openshift_maste...Jason DeTiberus2017-02-145-8/+596
* | Merge pull request #3332 from giuseppe/system-containers-haGiuseppe Scrivano2017-02-156-13/+65
|\ \
| * | node, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-143-10/+10
| * | master, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-142-12/+15
| * | node: simplify when conditionalsGiuseppe Scrivano2017-02-101-2/+5
| * | openvswitch: simplify when conditionalsGiuseppe Scrivano2017-02-101-4/+5
| * | master: support HA deployments with system containersGiuseppe Scrivano2017-02-102-2/+47
* | | Merge pull request #3350 from mwringe/bz1421860Scott Dodson2017-02-142-4/+4
|\ \ \ | |_|/ |/| |
| * | BZ1421860: increase Heapster's metric resolution to 30smwringe2017-02-132-4/+4
* | | Merge pull request #3351 from detiber/fixConfigClobberJason DeTiberus2017-02-1422-66/+22
|\ \ \
| * | | Fix cases where child classes override OpenShiftCLI valuesJason DeTiberus2017-02-1322-66/+22
| |/ /
* | | Merge pull request #3355 from tbielawa/idempotency_please_workScott Dodson2017-02-144-46/+73
|\ \ \
| * | | Add block+when skip to `openshift_facts` tasksTim Bielawa2017-02-141-46/+58
| * | | Trying to fix up/audit note some changesTim Bielawa2017-02-143-0/+15
* | | | Merge pull request #3359 from ewolinetz/logging_metrics_defaultsScott Dodson2017-02-142-2/+2
|\ \ \ \
| * | | | updating defaults for logging and metrics rolesewolinetz2017-02-142-2/+2
* | | | | Merge pull request #3308 from mtnbikenc/oc_labelRussell Teague2017-02-144-65/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modify playbooks to use oc_label moduleRussell Teague2017-02-144-77/+10