summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix : (node) labels defaults correctly to the variable openshift_node_labels ...Chengcheng Mu2015-10-091-1/+1
* Merge branch 'gce-support' of https://github.com/menren/openshift-ansible int...Chengcheng Mu2015-10-061-30/+5
|\
| * playbooks/openstack/openshift-cluster/launch.yml back to its correct versionChengcheng Mu2015-10-061-30/+5
* | Revert "Revert "GCE support""Chengcheng Mu2015-10-0616-80/+211
* | Merge pull request #657 from liggitt/schedulerBrenton Leanhardt2015-10-061-0/+2
|\ \
| * | Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
* | | Merge pull request #653 from arsogukpinar/masterBrenton Leanhardt2015-10-061-2/+2
|\ \ \ | |/ / |/| |
| * | Fix for name conflictAli Sogukpinar2015-10-051-2/+2
* | | Merge pull request #654 from openshift/revert-641-gce-supportThomas Wiest2015-10-0516-211/+80
|\ \ \ | |/ / |/| |
| * | Revert "GCE support"Thomas Wiest2015-10-0516-211/+80
|/ /
* | Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-0516-80/+211
|\|
| * openshift master public api url defaults to None, it will get its default val...Chengcheng Mu2015-10-023-31/+32
| * Removed some application specific code like insecure registries, heat templateChengcheng Mu2015-10-013-24/+3
| * oo_option fixed, some clean upChengcheng Mu2015-10-014-31/+3
| * Rebased on masterChengcheng Mu2015-10-010-0/+0
| |\
| | * fixed some issues to boot VM on GCEChengcheng Mu2015-10-0140-140/+401
| * | GCE-support (more information in PR, README_GCE.md)Chengcheng Mu2015-10-0118-55/+234
* | | Merge pull request #651 from twiest/cprThomas Wiest2015-10-024-5/+38
|\ \ \
| * | | added Template Ops ToolsThomas Wiest2015-10-024-5/+38
|/ / /
* | | Merge pull request #650 from smunilla/masterBrenton Leanhardt2015-10-021-0/+2
|\ \ \
| * | | openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla2015-10-021-0/+2
|/ / /
* | | Merge pull request #639 from jaryn/localonly_dnsBrenton Leanhardt2015-10-011-1/+1
|\ \ \
| * | | Prevent dns resolution recursion (loop).Jaroslav Henner2015-09-301-1/+1
* | | | Merge pull request #646 from smunilla/masterWesley Hearn2015-10-011-0/+14
|\ \ \ \
| * | | | openshift_facts.py: Ansible fact for openshift versionSamuel Munilla2015-10-011-0/+14
|/ / / /
* | | | Merge pull request #644 from dak1n1/logrotateStefanie Forrester2015-10-012-2/+2
|\ \ \ \
| * | | | added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester2015-10-012-2/+2
|/ / / /
* | | | Merge pull request #643 from kwoodson/cputrigKenny Woodson2015-10-011-0/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/ / /
* | | Merge pull request #640 from kwoodson/unitsKenny Woodson2015-09-301-0/+8
|\ \ \
| * | | Adding % to unitsKenny Woodson2015-09-301-0/+8
|/ / /
* | | Merge pull request #636 from kwoodson/quick1Kenny Woodson2015-09-301-8/+8
|\ \ \
| * | | Updating these to the correct typeKenny Woodson2015-09-301-8/+8
|/ / /
* | | Merge pull request #611 from wshearn/fix_product_typeWesley Hearn2015-09-301-1/+1
|\ \ \
| * | | Add missing ,Wesley Hearn2015-09-241-1/+1
* | | | Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-3013-8/+153
|\ \ \ \
| * | | | UpgradesScott Dodson2015-09-2313-8/+153
* | | | | Merge pull request #634 from abutcher/whats-nextBrenton Leanhardt2015-09-303-46/+11
|\ \ \ \ \
| * | | | | Point to advanced installation guide in READMEsAndrew Butcher2015-09-303-46/+11
|/ / / / /
* | | | | Merge pull request #630 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-2/+1
|\ \ \ \ \
| * | | | | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
* | | | | | Merge pull request #629 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-0/+2
|\| | | | |
| * | | | | added comment to the grow_docker_vg playbookMatt Woodson2015-09-291-0/+2
* | | | | | Merge pull request #628 from mwoodson/grow_docker_vgMatt Woodson2015-09-292-0/+245
|\| | | | |
| * | | | | added the grow_docker_vg adhoc playbookMatt Woodson2015-09-292-0/+245
|/ / / / /
* | | | | Merge pull request #626 from kwoodson/quickMatt Woodson2015-09-281-0/+4
|\ \ \ \ \
| * | | | | Added some debug when zbxapi has an issueKenny Woodson2015-09-281-0/+4
|/ / / / /
* | | | | Merge pull request #625 from kwoodson/triggerprotoKenny Woodson2015-09-284-1/+216
|\ \ \ \ \
| * | | | | Trigger prototype supportKenny Woodson2015-09-284-1/+216
* | | | | | Merge pull request #624 from abutcher/merge-factsBrenton Leanhardt2015-09-281-1/+1
|\ \ \ \ \ \