Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #962 from kwoodson/zbxgraph | Kenny Woodson | 2015-11-24 | 2 | -0/+662 |
|\ | | | | | Adding graph support for graphs and graphprototypes | ||||
| * | Adding zbx_graph support | Kenny Woodson | 2015-11-23 | 2 | -0/+662 |
|/ | |||||
* | Merge pull request #909 from detiber/mappingMethod | Brenton Leanhardt | 2015-11-23 | 4 | -99/+498 |
|\ | | | | | Add mappingMethod to identityProviders config | ||||
| * | Use the identity_providers from openshift_facts instead of always using the ↵ | Jason DeTiberus | 2015-11-23 | 1 | -1/+1 |
| | | | | | | | | inventory variable | ||||
| * | Refactor master identity provider configuration | Jason DeTiberus | 2015-11-23 | 4 | -99/+498 |
| | | | | | | | | | | | | - Remote template in favor of a filter plugin - Add additional validation for identity provider config - Add mappingMethod attribute for identity providers, default to 'claim' | ||||
* | | Merge pull request #960 from kwoodson/httptestfix | Kenny Woodson | 2015-11-23 | 1 | -1/+9 |
|\ \ | | | | | | | Fixing the step parameters with a "no" when not passed with that key | ||||
| * | | Modified step params to be in order when passed as a list | Kenny Woodson | 2015-11-23 | 1 | -1/+9 |
| |/ | |||||
* | | Merge pull request #957 from detiber/upgradeFix | Brenton Leanhardt | 2015-11-23 | 1 | -0/+4 |
|\ \ | |/ |/| | Add serviceAccountConfig.masterCA during 3.1 upgrade | ||||
| * | Add serviceAccountConfig.masterCA during 3.1 upgrade | Jason DeTiberus | 2015-11-23 | 1 | -0/+4 |
|/ | | | | | - uses the value of oauthConfig.masterCA if present, otherwise sets it to ca.crt | ||||
* | Automatic commit of package [openshift-ansible] release [3.0.15-1]. | Kenny Woodson | 2015-11-20 | 2 | -2/+20 |
| | |||||
* | Merge pull request #950 from kwoodson/clonegroupfix | Kenny Woodson | 2015-11-20 | 1 | -15/+19 |
|\ | | | | | Fixing clone groups in multi_inventory | ||||
| * | Fixing clone group functionality. Also separating extra_vars from extra_groups | Kenny Woodson | 2015-11-20 | 1 | -15/+19 |
| | | |||||
* | | Merge pull request #890 from smunilla/friendly_unattended_errors | Brenton Leanhardt | 2015-11-20 | 3 | -1/+78 |
|\ \ | |/ |/| | atomic-openshift-installer: connect_to error handling | ||||
| * | Check the end result on bad config file | Samuel Munilla | 2015-11-20 | 1 | -3/+3 |
| | | |||||
| * | Add some tests for a bad config | Samuel Munilla | 2015-11-20 | 2 | -0/+72 |
| | | |||||
| * | atomic-openshift-installer: connect_to error handling | Samuel Munilla | 2015-11-20 | 1 | -1/+6 |
| | | | | | | | | Catch the exception that happens when connect_to isn't specified in installer.cfg.yaml | ||||
* | | Merge pull request #914 from smunilla/pylint_fixes | Brenton Leanhardt | 2015-11-20 | 1 | -5/+7 |
|\ \ | |/ |/| | atomic-openshift-installer: pylint fixes | ||||
| * | atomic-openshift-installer: pylint fixes | Samuel Munilla | 2015-11-20 | 1 | -5/+7 |
|/ | | | | A few fixes to keep pylint happy. | ||||
* | Merge pull request #929 from sdodson/fix-30-imagestreams | Brenton Leanhardt | 2015-11-20 | 114 | -6/+22520 |
|\ | | | | | Install version dependent image streams for v1.0 and v1.1 | ||||
| * | Install version dependent image streams for v1.0 and v1.1 | Scott Dodson | 2015-11-18 | 114 | -6/+22520 |
| | | |||||
* | | Merge pull request #938 from brenton/uninstall | Brenton Leanhardt | 2015-11-20 | 1 | -5/+5 |
|\ \ | | | | | | | Making the uninstall playbook more flexible | ||||
| * | | Making the uninstall playbook more flexible | Brenton Leanhardt | 2015-11-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | This handles stage environments as well as the eventual change of aep3_beta to aep3 | ||||
* | | | Merge pull request #924 from detiber/noSetHostname | Brenton Leanhardt | 2015-11-20 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | Do not update the hostname | ||||
| * | | | Do not update the hostname | Jason DeTiberus | 2015-11-17 | 1 | -3/+0 |
| | | | | |||||
* | | | | Merge pull request #945 from abutcher/OoCollect | Brenton Leanhardt | 2015-11-20 | 3 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | Replace map with oo_collect for python-jinja2 <2.7 | ||||
| * | | | | Replace map with oo_collect to support python-jinja2 <2.7 | Andrew Butcher | 2015-11-20 | 3 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #902 from dgoodwin/rpm-test-fix | Brenton Leanhardt | 2015-11-20 | 3 | -8/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | Default to OSE 3.1 in interactive installer instead of 3.0. | ||||
| * | | | | | Pylint fix for long line in cli docstring. | Devan Goodwin | 2015-11-16 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Default to installing OSE 3.1 instead of 3.0. | Devan Goodwin | 2015-11-16 | 2 | -3/+4 |
| | | | | | | |||||
| * | | | | | Fix tests on systems with openshift-ansible rpms installed. | Devan Goodwin | 2015-11-16 | 2 | -4/+11 |
| | | | | | | |||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.14-1]. | Brenton Leanhardt | 2015-11-19 | 2 | -2/+67 |
| | | | | | | |||||
* | | | | | | Merge pull request #939 from mwoodson/master_checks | Matt Woodson | 2015-11-19 | 1 | -0/+82 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | added metric quantile items to zabbix | ||||
| * | | | | | | added metric items to zabbix for openshift online | Matt Woodson | 2015-11-19 | 1 | -0/+82 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #940 from kwoodson/usergrpfix | Kenny Woodson | 2015-11-19 | 1 | -22/+42 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Added the ability to add users to usergroups through the zbx_usergroups module. | ||||
| * | | | | | Updating usergroups to accept users | Kenny Woodson | 2015-11-19 | 1 | -22/+42 |
| | | | | | | |||||
* | | | | | | Merge pull request #937 from rdossin1A/machine_types | Thomas Wiest | 2015-11-19 | 4 | -2/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Differentiate machine types on GCE (master and nodes) | ||||
| * | | | | | | Differentiate machine types on GCE (master and nodes) | Romain Dossin | 2015-11-19 | 4 | -2/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #933 from menren/dockerOnMasterAWS | Thomas Wiest | 2015-11-19 | 3 | -7/+14 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Docker on master aws | ||||
| * | | | | | | Merge pull request #1 from detiber/dockerOnMasterAWS | Chengcheng Mu | 2015-11-19 | 3 | -6/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | small tweaks for adding docker volume for aws master hosts | ||||
| | * | | | | | | small tweaks for adding docker volume for aws master hosts | Jason DeTiberus | 2015-11-18 | 3 | -6/+5 |
| |/ / / / / / | |||||
| * | | | | / | add a volume on master host, in AWS provisioning | Chengcheng Mu | 2015-11-18 | 3 | -3/+11 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #881 from abutcher/namedCertRefactor | Brenton Leanhardt | 2015-11-19 | 5 | -35/+108 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Refactor named certficates | ||||
| * | | | | | Update certificate paths when 'names' key is provided. | Andrew Butcher | 2015-11-18 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add additive_facts_to_overwrite instead of overwriting all additive_facts | Andrew Butcher | 2015-11-16 | 2 | -18/+31 |
| | | | | | | |||||
| * | | | | | Refactor named certificates. | Andrew Butcher | 2015-11-16 | 5 | -35/+94 |
| | | | | | | |||||
* | | | | | | Merge pull request #936 from detiber/uninstallUpdate | Brenton Leanhardt | 2015-11-18 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Uninstall - Remove systemd wants file for node | ||||
| * | | | | | Uninstall - Remove systemd wants file for node | Jason DeTiberus | 2015-11-18 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #918 from detiber/fix_ec2_instance_type_override | Thomas Wiest | 2015-11-18 | 2 | -9/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix ec2 instance type override | ||||
| * | | | | | | Fix ec2 instance type override | Jason DeTiberus | 2015-11-17 | 2 | -9/+16 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #934 from detiber/requiretty | Thomas Wiest | 2015-11-18 | 1 | -0/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | ec2 - force !requiretty for ssh_user |