summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #698 from lebauce/flannelBrenton Leanhardt2015-11-0614-0/+320
|\ \ \
| * | | Change flannel registration default valuesSylvain Baubeau2015-10-281-3/+3
| * | | Remove empty notify sectionSylvain Baubeau2015-10-281-1/+0
| * | | Check etcd certs exist for flannel when its support is enabledSylvain Baubeau2015-10-271-1/+1
| * | | Fix when neither use_openshift_sdn nor use_flannel are specifiedSylvain Baubeau2015-10-271-1/+1
| * | | Generate etcd certificats for flannel when is not embeddedSylvain Baubeau2015-10-273-4/+74
| * | | Add missing 2nd true parameters to default Jinja filterSylvain Baubeau2015-10-271-3/+3
| * | | Use 'command' module instead of 'shell'Sylvain Baubeau2015-10-271-1/+1
| * | | Add flannel modules documentationSylvain Baubeau2015-10-274-5/+23
| * | | Only remove IPv4 address from docker bridgeSylvain Baubeau2015-10-271-1/+1
| * | | Remove multiple use_flannel fact definitionSylvain Baubeau2015-10-272-11/+1
| * | | Ensure openshift-sdn and flannel can't be used at the same timeSylvain Baubeau2015-10-271-0/+4
| * | | Add flannel supportSylvain Baubeau2015-10-2716-1/+240
* | | | Merge pull request #838 from detiber/upgradeFix2Brenton Leanhardt2015-11-061-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix indentation on whenJason DeTiberus2015-11-061-1/+1
* | | | Merge pull request #837 from detiber/bz1278863Brenton Leanhardt2015-11-062-10/+1
|\ \ \ \
| * | | | Bug 1278863 - Error using openshift_pkg_versionJason DeTiberus2015-11-062-10/+1
* | | | | Merge pull request #835 from brenton/masterBrenton Leanhardt2015-11-061-1/+1
|\ \ \ \ \
| * | | | | Updating the atomic-openshift-isntaller local connection logic for the connec...Brenton Leanhardt2015-11-061-1/+1
* | | | | | Merge pull request #822 from detiber/upgradeFix2Brenton Leanhardt2015-11-067-151/+586
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'dgoodwin/pre-upgrade' into upgradeFix2Jason DeTiberus2015-11-062-7/+12
| |\ \ \ \ \
| | * | | | | Minor upgrade improvements.Devan Goodwin2015-11-062-7/+12
| * | | | | | Merge pull request #52 from abutcher/pcs-restart-master3Jason DeTiberus2015-11-062-0/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Missing conditionals for api/controller sysconfig.Andrew Butcher2015-11-061-0/+2
| | * | | | | Wait for cluster to recover after pcs resource restart.Andrew Butcher2015-11-061-0/+8
| |/ / / / /
| * | | | | remove debug statementJason DeTiberus2015-11-061-2/+0
| * | | | | Fix removal of kubernetesMasterConfig.apiLevelsJason DeTiberus2015-11-061-1/+1
| * | | | | Fix issues related to upgrade packages being unavailableJason DeTiberus2015-11-062-6/+16
| * | | | | Merge pull request #51 from dgoodwin/pre-upgradeJason DeTiberus2015-11-062-1/+5
| |\ \ \ \ \
| | * | | | | Fix creation of origin symlink when dir already exists.Devan Goodwin2015-11-061-1/+4
| | * | | | | Write new config to disk after successful upgrade.Devan Goodwin2015-11-061-0/+1
| * | | | | | Merge remote-tracking branch 'origin/upgradeFix2' into upgradeFix2Jason DeTiberus2015-11-064-4/+251
| |\ \ \ \ \ \
| | * | | | | | Merge pull request #50 from dgoodwin/pre-upgradeJason DeTiberus2015-11-063-1/+195
| | |\| | | | |
| | | * | | | | Fix pylint errors with getting hosts to run on.Devan Goodwin2015-11-061-1/+3
| | | * | | | | Add pre-upgrade script to be run on first master.Devan Goodwin2015-11-062-0/+192
| | * | | | | | Merge pull request #49 from abutcher/pcs-restart-master2Jason DeTiberus2015-11-062-3/+56
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Start to handle pacemaker ha during upgradeAndrew Butcher2015-11-062-3/+56
| | |/ / / / /
| * / / / / / Fix apiLevels modificationsJason DeTiberus2015-11-061-7/+3
| |/ / / / /
| * | | | | add master_hostnames definition for upgradeJason DeTiberus2015-11-051-0/+4
| * | | | | Additional upgrade enhancementsJason DeTiberus2015-11-053-72/+101
| * | | | | Handle backups for separate etcd hosts if necessary.Devan Goodwin2015-11-051-9/+27
| * | | | | Further upgrade improvementsJason DeTiberus2015-11-051-46/+168
| * | | | | Upgrade improvementsDevan Goodwin2015-11-054-101/+93
* | | | | | Merge pull request #830 from detiber/nov1beta3Brenton Leanhardt2015-11-061-3/+3
|\ \ \ \ \ \
| * | | | | | apiLevel changesJason DeTiberus2015-11-061-3/+3
* | | | | | | Merge pull request #796 from abutcher/master-proxy-certsBrenton Leanhardt2015-11-061-9/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix issue with master.proxy-client.{crt,key} and omit.Andrew Butcher2015-11-021-9/+14
* | | | | | | | Merge pull request #818 from abutcher/custom-certs-fixesBrenton Leanhardt2015-11-062-9/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix file check conditional.Andrew Butcher2015-11-051-1/+1
| * | | | | | | | Don't check for certs in data_dir just raise when they can't be found. Fix typo.Andrew Butcher2015-11-052-8/+3
| | |_|/ / / / / | |/| | | | | |