summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #859 from detiber/no_multi_ec2Thomas Wiest2015-11-103-1/+2
|\ | | | | Remove references to multi_ec2.py
| * 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
|\ \ | |/ |/| Package the default ansible.cfg with atomic-openshift-utils.
| * Add separate step to enable services during upgrade.Devan Goodwin2015-11-101-3/+19
| | | | | | | | | | Instead of combining this with tasks to restart services, add a separate started+enabled play for masters and nodes at the end of the playbook.
| * 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
| | | | | | | | | | | | With the openshift to atomic-openshift renames, some services were not enabled after upgrade. Added enabled directives to all service restart lines in the upgrade playbook.
| * Fix missing etcd_data_dir bug.Devan Goodwin2015-11-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | A late change to original PR was not properly tested, there is a problem in the facts when upgrading where the deployment type is openshift-enterprise, and the system facts start reporting data_dir and config_base as referencing origin directories, which are not yet symlinked to their previous openshift variants. To correct we watch for a scenario where we evaluate these to origin directories, which don't exist, but the openshift ones do. (to allow for installation to still point at the origin variety)
| * Package the default ansible.cfg with atomic-openshift-utils.Devan Goodwin2015-11-102-1/+4
|/ | | | | | | If this file exists on disk, the installer will use it if the user didn't specify an ansible config file on the CLI. Rename share directory to match the rpm name. (utils vs util)
* Merge pull request #852 from abutcher/ldap-exampleBrenton Leanhardt2015-11-091-0/+3
|\ | | | | Add ldap auth to example inventory
| * 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
|\ \ | | | | | | Test fixes related to connect_to
| * | Various fixes related to connect_toBrenton Leanhardt2015-11-093-11/+21
| |/ | | | | | | | | There the tests didn't know anything about connect_to and we had a case where we weren't handling the migration from the 3.0 installer config format to 3.1
* | Merge pull request #848 from dgoodwin/drop-302-reqBrenton Leanhardt2015-11-091-4/+1
|\ \ | | | | | | Remove upgrade playbook restriction on 3.0.2.
| * | Remove upgrade playbook restriction on 3.0.2.Devan Goodwin2015-11-091-4/+1
| |/ | | | | | | | | This is blocking 3.0.1 upgrades to 3.1 incorrectly, which is a scenario we should support.
* | 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
| | | | |