Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #867 from ibotty/rm-netaddr-dep | Brenton Leanhardt | 2015-11-13 | 2 | -4/+20 |
|\ | | | | | remove netaddr dependency | ||||
| * | remove netaddr dependency | Tobias Florek | 2015-11-11 | 2 | -4/+20 |
| | | |||||
* | | Merge pull request #882 from kwoodson/itservice | Kenny Woodson | 2015-11-12 | 1 | -1/+2 |
|\ \ | | | | | | | Fixed a bug. Upon creation also add dependencies to slas. | ||||
| * | | Dependencies need to be added when a create occurs on SLA object. | Kenny Woodson | 2015-11-12 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #875 from kwoodson/itservice | Kenny Woodson | 2015-11-12 | 2 | -1/+266 |
|\| | | | | | | | | Adding support for zabbix slas. | ||||
| * | | adding itservice | Kenny Woodson | 2015-11-12 | 2 | -1/+266 |
| | | | |||||
* | | | Merge pull request #873 from sdodson/latest-streams | Brenton Leanhardt | 2015-11-11 | 2 | -76/+327 |
|\ \ \ | | | | | | | | | Sync with the latest image streams | ||||
| * | | | Sync with the latest image streams | Scott Dodson | 2015-11-11 | 2 | -76/+327 |
| | | | | |||||
* | | | | Merge pull request #781 from sdodson/xpaas-1.1 | Brenton Leanhardt | 2015-11-11 | 33 | -1918/+3585 |
|\ \ \ \ | | | | | | | | | | | Update xpaas streams and templates for their v1.1.0 release | ||||
| * | | | | Migrate xpaas content from pre v1.1.0 | Scott Dodson | 2015-11-11 | 1 | -0/+50 |
| | | | | | | | | | | | | | | | | | | | | This removes existing templates from disk and from the openshift namespace. | ||||
| * | | | | Import latest xpaas templates and image streams | Scott Dodson | 2015-11-11 | 32 | -1918/+3535 |
| |/ / / | |||||
* | | | | Merge pull request #874 from joelddiaz/s3-sla | Joel Diaz | 2015-11-11 | 2 | -0/+34 |
|\ \ \ \ | |/ / / |/| | | | Add zabbix pieces to hold AWS S3 bucket stats | ||||
| * | | | Add zabbix pieces to hold AWS S3 bucket stats | Joel Diaz | 2015-11-11 | 2 | -0/+34 |
| | | | | |||||
* | | | | Refactor upgrade playbook(s) | Jason DeTiberus | 2015-11-10 | 1 | -35/+36 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split playbooks into two, one for 3.0 minor upgrades and one for 3.0 to 3.1 upgrades - Move upgrade playbooks to common/openshift/cluster/upgrades from adhoc - Added a byo wrapper playbooks to set the groups based on the byo conventions, other providers will need similar playbooks added eventually - installer wrapper updates for refactored upgrade playbooks - call new 3.0 to 3.1 upgrade playbook - various fixes for edge cases I hit with a really old config laying around. - fix output of host facts to show connect_to value. | ||||
* | | | Merge pull request #857 from sosiouxme/20151110-infrastructure-templates | Brenton Leanhardt | 2015-11-10 | 7 | -0/+560 |
|\ \ \ | | | | | | | | | examples: include logging and metrics infrastructure | ||||
| * | | | examples: include logging and metrics infrastructure | Luke Meyer | 2015-11-10 | 7 | -0/+560 |
| | | | | |||||
* | | | | 1279746: Fix leftover disabled features line in config template. | Devan Goodwin | 2015-11-10 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix missing etcd_data_dir bug. | Devan Goodwin | 2015-11-10 | 1 | -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) | ||||
* | / | Read etcd data dir from appropriate config file. | Devan Goodwin | 2015-11-09 | 2 | -8/+50 |
| |/ |/| | | | | | | | | | | | | | | | 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 #743 from abutcher/sync-period-flag | Brenton Leanhardt | 2015-11-06 | 3 | -7/+10 |
|\ \ | | | | | | | New `iptablesSyncPeriod` field in node configuration | ||||
| * | | New `iptablesSyncPeriod` field in node configuration | Andrew Butcher | 2015-11-06 | 3 | -7/+10 |
| | | | |||||
* | | | Merge pull request #698 from lebauce/flannel | Brenton Leanhardt | 2015-11-06 | 12 | -0/+239 |
|\ \ \ | |/ / |/| | | Add support for flannel | ||||
| * | | Change flannel registration default values | Sylvain Baubeau | 2015-10-28 | 1 | -3/+3 |
| | | | |||||
| * | | Remove empty notify section | Sylvain Baubeau | 2015-10-28 | 1 | -1/+0 |
| | | | |||||
| * | | Fix when neither use_openshift_sdn nor use_flannel are specified | Sylvain Baubeau | 2015-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | Generate etcd certificats for flannel when is not embedded | Sylvain Baubeau | 2015-10-27 | 2 | -4/+4 |
| | | | |||||
| * | | Add missing 2nd true parameters to default Jinja filter | Sylvain Baubeau | 2015-10-27 | 1 | -3/+3 |
| | | | |||||
| * | | Use 'command' module instead of 'shell' | Sylvain Baubeau | 2015-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | Add flannel modules documentation | Sylvain Baubeau | 2015-10-27 | 4 | -5/+23 |
| | | | |||||
| * | | Only remove IPv4 address from docker bridge | Sylvain Baubeau | 2015-10-27 | 1 | -1/+1 |
| | | | |||||
| * | | Remove multiple use_flannel fact definition | Sylvain Baubeau | 2015-10-27 | 2 | -11/+1 |
| | | | |||||
| * | | Ensure openshift-sdn and flannel can't be used at the same time | Sylvain Baubeau | 2015-10-27 | 1 | -0/+4 |
| | | | |||||
| * | | Add flannel support | Sylvain Baubeau | 2015-10-27 | 14 | -1/+229 |
| | | | | | | | | | | | | Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com> | ||||
* | | | Merge pull request #837 from detiber/bz1278863 | Brenton Leanhardt | 2015-11-06 | 2 | -10/+1 |
|\ \ \ | | | | | | | | | Bug 1278863 - Error using openshift_pkg_version | ||||
| * | | | Bug 1278863 - Error using openshift_pkg_version | Jason DeTiberus | 2015-11-06 | 2 | -10/+1 |
| | | | | | | | | | | | | | | | | | | | | - Install correct version of package in openshift_master_ca - Remove duplicate yum tasks in openshift_node | ||||
* | | | | Merge pull request #822 from detiber/upgradeFix2 | Brenton Leanhardt | 2015-11-06 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | Upgrade enhancements | ||||
| * | | | | Missing conditionals for api/controller sysconfig. | Andrew Butcher | 2015-11-06 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Start to handle pacemaker ha during upgrade | Andrew Butcher | 2015-11-06 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge pull request #830 from detiber/nov1beta3 | Brenton Leanhardt | 2015-11-06 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | apiLevel changes | ||||
| * | | | | | apiLevel changes | Jason DeTiberus | 2015-11-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove kubernetesMasterConfig.apiLevels if >= 3.1/1.1 - change apiLevels conditional from using deployment_type to version_greater_than_3_1_or_1_1 | ||||
* | | | | | | Merge pull request #796 from abutcher/master-proxy-certs | Brenton Leanhardt | 2015-11-06 | 1 | -9/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix issue with master.proxy-client.{crt,key} and omit. | ||||
| * | | | | | | Fix issue with master.proxy-client.{crt,key} and omit. | Andrew Butcher | 2015-11-02 | 1 | -9/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #818 from abutcher/custom-certs-fixes | Brenton Leanhardt | 2015-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Named certificate fixes | ||||
| * | | | | | | | Don't check for certs in data_dir just raise when they can't be found. Fix typo. | Andrew Butcher | 2015-11-05 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #836 from mwoodson/disk_checks | Matt Woodson | 2015-11-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | cleaned up network checks | ||||
| * | | | | | | | more cleanup of names | Matt Woodson | 2015-11-06 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #834 from mwoodson/disk_checks | Matt Woodson | 2015-11-06 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | cleaned up network checks | ||||
| * | | | | | | | cleaned up network checks | Matt Woodson | 2015-11-06 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #832 from mwoodson/disk_checks | Matt Woodson | 2015-11-06 | 3 | -4/+64 |
|\| | | | | | | | |_|_|_|/ / / |/| | | | | | | added network checks. also updated item prototype code to support more | ||||
| * | | | | | | added network checks. also updated item prototype code to support more | Matt Woodson | 2015-11-06 | 3 | -4/+64 |
| | | | | | | |