summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #850 from dgoodwin/etcd-dirBrenton Leanhardt2015-11-093-9/+51
|\ | | | | Read etcd data dir from appropriate config file.
| * Read etcd data dir from appropriate config file.Devan Goodwin2015-11-093-9/+51
| | | | | | | | | | | | | | | | | | Rather than assuming the etcd data dir, we now read if from master-config.yaml if using embedded etcd, otherwise from etcd.conf. Doing so now required use of PyYAML to parse config file when gathering facts. Fixed discrepancy with data_dir fact and openshift-enterprise deployment_type.
* | Merge pull request #851 from smunilla/scaleup_node_errorBrenton Leanhardt2015-11-091-1/+1
|\ \ | | | | | | atomic-openshift-installer: Generate inventory off hosts_to_run_on
| * | atomic-openshift-installer: Generate inventory off hosts_to_run_onSamuel Munilla2015-11-091-1/+1
| |/ | | | | | | | | This generates the ansible inventory based on the pruned list of non-installed hosts we've created rather than the full host list provided in installer.cfg.yaml
* | Merge pull request #845 from abutcher/flannel-client-certsBrenton Leanhardt2015-11-091-3/+8
|\ \ | |/ |/| Fix external etcd sans flannel
| * 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 configuration
| * New `iptablesSyncPeriod` field in node configurationAndrew Butcher2015-11-064-7/+13
| |
* | Merge pull request #698 from lebauce/flannelBrenton Leanhardt2015-11-0614-0/+320
|\ \ | | | | | | Add support for flannel
| * | 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
| | | | | | | | | | | | Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
* | | Merge pull request #838 from detiber/upgradeFix2Brenton Leanhardt2015-11-061-1/+1
|\ \ \ | |_|/ |/| | Fix indentation on when
| * | 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_version
| * | | Bug 1278863 - Error using openshift_pkg_versionJason DeTiberus2015-11-062-10/+1
| | | | | | | | | | | | | | | | | | | | - Install correct version of package in openshift_master_ca - Remove duplicate yum tasks in openshift_node
* | | | Merge pull request #835 from brenton/masterBrenton Leanhardt2015-11-061-1/+1
|\ \ \ \ | | | | | | | | | | Updating the atomic-openshift-isntaller local connection logic for th…
| * | | | Updating the atomic-openshift-isntaller local connection logic for the ↵Brenton Leanhardt2015-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | connect_to addition.
* | | | | Merge pull request #822 from detiber/upgradeFix2Brenton Leanhardt2015-11-067-151/+586
|\ \ \ \ \ | | |_|/ / | |/| | | Upgrade enhancements
| * | | | Merge remote-tracking branch 'dgoodwin/pre-upgrade' into upgradeFix2Jason DeTiberus2015-11-062-7/+12
| |\ \ \ \
| | * | | | Minor upgrade improvements.Devan Goodwin2015-11-062-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip some 3.1 checks if doing a 3.0.x to 3.0.2 upgrade. Improve error message when oc whoami fails (i.e. openshift is down) during pre-upgrade checks, rather than assuming the binary doesn't exist.
| * | | | | Merge pull request #52 from abutcher/pcs-restart-master3Jason DeTiberus2015-11-062-0/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | | Wait for cluster to recover after pcs resource restart.
| | * | | | 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
| |\ \ \ \ | | | | | | | | | | | | Pre upgrade
| | * | | | 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
| | |\| | | | | | | | | | | | | | | | | | Run pre-upgrade script on nodes
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Script currently just checks for port names that are no longer valid. In theory other checks may be added to this script in the future. Script was originally written by Steve Milner and Andy Goldstein. If the script fails, ansible seems to handle this nicely by default, exiting the upgrade and displaying stderr and stdout, both of which contain useful info on what the problem was.
| | * | | | | Merge pull request #49 from abutcher/pcs-restart-master2Jason DeTiberus2015-11-062-3/+56
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Start to handle pacemaker ha during upgrade
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rework the version checking - provide better safety if the apiLevel attributes are missing - ensure a list of api levels are present - remove a list of api levels - pylint fixes
| * | | | Handle backups for separate etcd hosts if necessary.Devan Goodwin2015-11-051-9/+27
| | | | |
| * | | | Further upgrade improvementsJason DeTiberus2015-11-051-46/+168
| | | | | | | | | | | | | | | | | | | | | | | | | - Restart masters post reconcile - generate missing master certs and sync to masters