summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #860 from smunilla/disable_container_based_installBrenton Leanhardt2015-11-102-9/+11
|\
| * Update tests now that cli is not asking for rpm/container installSamuel Munilla2015-11-101-2/+2
| * atomic-openshift-installer: Remove question for container installSamuel Munilla2015-11-101-7/+9
* | Merge pull request #857 from sosiouxme/20151110-infrastructure-templatesBrenton Leanhardt2015-11-107-0/+560
|\ \
| * | examples: include logging and metrics infrastructureLuke Meyer2015-11-107-0/+560
| |/
* | Merge pull request #859 from detiber/no_multi_ec2Thomas Wiest2015-11-103-1/+2
|\ \
| * | Remove references to multi_ec2.pyJason DeTiberus2015-11-103-1/+2
| |/
* | Merge pull request #854 from dgoodwin/pkg-ansible-cfgBrenton Leanhardt2015-11-105-3/+27
|\ \ | |/ |/|
| * Add separate step to enable services during upgrade.Devan Goodwin2015-11-101-3/+19
| * 1279746: Fix leftover disabled features line in config template.Devan Goodwin2015-11-101-1/+0
| * 1279734: Ensure services are enabled after upgrade.Devan Goodwin2015-11-101-4/+4
| * Fix missing etcd_data_dir bug.Devan Goodwin2015-11-101-0/+6
| * Package the default ansible.cfg with atomic-openshift-utils.Devan Goodwin2015-11-102-1/+4
|/
* Merge pull request #852 from abutcher/ldap-exampleBrenton Leanhardt2015-11-091-0/+3
|\
| * Add ldap auth identity provider to example inventory.Andrew Butcher2015-11-091-0/+3
* | Merge pull request #849 from brenton/test_fixesBrenton Leanhardt2015-11-093-11/+21
|\ \
| * | Various fixes related to connect_toBrenton Leanhardt2015-11-093-11/+21
| |/
* | Merge pull request #848 from dgoodwin/drop-302-reqBrenton Leanhardt2015-11-091-4/+1
|\ \
| * | Remove upgrade playbook restriction on 3.0.2.Devan Goodwin2015-11-091-4/+1
| |/
* | Merge pull request #850 from dgoodwin/etcd-dirBrenton Leanhardt2015-11-093-9/+51
|\ \
| * | Read etcd data dir from appropriate config file.Devan Goodwin2015-11-093-9/+51
| |/
* | Merge pull request #851 from smunilla/scaleup_node_errorBrenton Leanhardt2015-11-091-1/+1
|\ \
| * | atomic-openshift-installer: Generate inventory off hosts_to_run_onSamuel Munilla2015-11-091-1/+1
| |/
* | Merge pull request #845 from abutcher/flannel-client-certsBrenton Leanhardt2015-11-091-3/+8
|\ \ | |/ |/|
| * Conditionals for flannel etcd client certs.Andrew Butcher2015-11-081-3/+8
|/
* Merge pull request #743 from abutcher/sync-period-flagBrenton Leanhardt2015-11-064-7/+13
|\
| * New `iptablesSyncPeriod` field in node configurationAndrew Butcher2015-11-064-7/+13
* | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:48:57 +0000