summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1728 from brenton/bz1324729Brenton Leanhardt2016-04-082-8/+8
|\
| * Bug 1324729 - Import xPaas image streams failed during 3.2 installationBrenton Leanhardt2016-04-072-8/+8
* | Merge pull request #1720 from abutcher/fix-docker-installBrenton Leanhardt2016-04-071-2/+2
|\ \ | |/ |/|
| * Test docker_version_result.stdout when determining if docker should be instal...Andrew Butcher2016-04-061-2/+2
* | Merge pull request #1719 from kwoodson/oadmrouterKenny Woodson2016-04-0711-82/+1375
|\ \
| * | First attempt at oadm router moduleKenny Woodson2016-04-0711-82/+1375
* | | Merge pull request #1724 from abutcher/nfs-no-commonBrenton Leanhardt2016-04-072-8/+7
|\ \ \
| * | | Remove openshift_common dep from openshift_storage_nfsAndrew Butcher2016-04-062-8/+7
* | | | Merge pull request #1722 from abutcher/containerized-cloudproviderBrenton Leanhardt2016-04-074-4/+4
|\ \ \ \
| * | | | Add cloudprovider config dir to docker options.Andrew Butcher2016-04-064-4/+4
| | |_|/ | |/| |
* | | | Merge pull request #1699 from abutcher/check-cloudprovider-kindBrenton Leanhardt2016-04-065-22/+25
|\ \ \ \
| * | | | Check for kind in cloudprovider facts prior to accessing.Andrew Butcher2016-04-045-22/+25
* | | | | Merge pull request #1660 from dgoodwin/admission-configBrenton Leanhardt2016-04-063-4/+56
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add support for configuring oauth templates.Devan Goodwin2016-04-013-3/+28
| * | | | Add support for templating master admissionConfig.Devan Goodwin2016-04-013-1/+28
| |/ / /
* | | | Merge pull request #1721 from kwoodson/userrefreshKenny Woodson2016-04-061-0/+2
|\ \ \ \
| * | | | Update for zbx_user refreshKenny Woodson2016-04-061-0/+2
* | | | | Docker 1.9 is actually cool starting in origin 1.1.4Scott Dodson2016-04-061-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #1695 from brenton/bz1323123Brenton Leanhardt2016-04-067-3/+4
|\ \ \ \
| * | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api a...Brenton Leanhardt2016-04-017-3/+4
| * | | | Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ose3.2...Brenton Leanhardt2016-04-011-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1698 from sdodson/xpaas13Brenton Leanhardt2016-04-06100-4502/+9996
|\ \ \ \
| * | | | XPAAS v1.3 for OSE 3.2Scott Dodson2016-04-0453-5218/+1805
| * | | | XPAAS 1.3 content for OSE 3.1Scott Dodson2016-04-0448-37/+8944
| |/ / /
* | | | when docker is installed, make it 1.8.2 to avoid issuesMatt Woodson2016-04-051-1/+1
* | | | Merge pull request #1700 from brenton/32haBrenton Leanhardt2016-04-051-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Pacemaker is unsupported for 3.2Brenton Leanhardt2016-04-041-0/+4
| | |/ | |/|
* / | Downgrade to docker 1.8.2 if installing OSE < 3.2Scott Dodson2016-04-059-25/+43
|/ /
* | Fixing regexp. Periods are no longer allowedKenny Woodson2016-04-048-37/+109
* | Merge pull request #1702 from joelddiaz/heartbeat-severityJoel Diaz2016-04-041-0/+5
|\ \
| * | add higher severity trigger if no heartbeat for 1 hourJoel Diaz2016-04-041-0/+5
* | | Fixed oc_edit by requiring name and contentKenny Woodson2016-04-042-4/+6
* | | Merge pull request #1693 from kwoodson/yedit_enhancementsKenny Woodson2016-04-0415-249/+1311
|\ \ \ | |_|/ |/| |
| * | Yedit enhancementsKenny Woodson2016-04-0415-249/+1311
* | | Allow for overriding scheduler configJason DeTiberus2016-03-315-18/+26
* | | Bug 1320829 - Ensure docker installed for factsJason DeTiberus2016-03-3112-82/+170
* | | Merge pull request #1634 from abutcher/aws-cloud-providerBrenton Leanhardt2016-03-3116-71/+223
|\ \ \
| * | | Add AWS cloud provider support.Andrew Butcher2016-03-2916-71/+223
* | | | Merge pull request #1684 from brenton/bz1322335Brenton Leanhardt2016-03-311-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Bug 1322335 - The package name is wrong for rpm upgradeBrenton Leanhardt2016-03-301-1/+5
| |/ /
* | | Fixed generate header.Kenny Woodson2016-03-315-5/+5
* | | Merge pull request #1679 from kwoodson/apirefactorKenny Woodson2016-03-3026-254/+1956
|\ \ \ | |/ / |/| |
| * | Moving generation of ansible module side by side with module.Kenny Woodson2016-03-3026-254/+1956
* | | The systemd unit for atomic-openshift-master wasn't not being createdBrenton Leanhardt2016-03-291-6/+16
* | | Use openshift.master.ha instead of duplicating the logicBrenton Leanhardt2016-03-292-7/+7
* | | Workaround for authenticated registriesBrenton Leanhardt2016-03-291-0/+21
* | | First pass at systemd unit refactorBrenton Leanhardt2016-03-296-96/+104
* | | Merge pull request #1671 from sjenning/systemd-unit-fixesBrenton Leanhardt2016-03-296-6/+6
|\ \ \
| * | | make docker service want ose containerized servicesSeth Jennings2016-03-286-6/+6
* | | | fix the key name for the dynamic item of avalablezhizhang2016-03-291-2/+2