Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into upgrade | Devan Goodwin | 2015-11-02 | 43 | -372/+535 |
|\ | |||||
| * | Merge pull request #785 from joelddiaz/pcp-zabbix-status | Joel Diaz | 2015-11-02 | 2 | -0/+23 |
| |\ | | | | | | | get zabbix ready to start tracking status of pcp | ||||
| | * | get zabbix ready to start tracking status of pcp | Joel Diaz | 2015-11-02 | 2 | -0/+23 |
| | | | |||||
| * | | Merge pull request #772 from detiber/aep | Brenton Leanhardt | 2015-11-02 | 3 | -2/+18 |
| |\ \ | | | | | | | | | Disable OpenShift features if installing Atomic Enterprise | ||||
| | * | | Disable OpenShift features if installing Atomic Enterprise | Jason DeTiberus | 2015-10-30 | 3 | -2/+18 |
| | | | | |||||
| * | | | Merge pull request #786 from mwoodson/cpu_alert | Matt Woodson | 2015-11-02 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | changed the cpu alert to only alert if cpu idle more than 5x. | ||||
| | * | | | changed the cpu alert to only alert if cpu idle more than 5x. Change alert ↵ | Matt Woodson | 2015-11-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | to warning | ||||
| * | | | | Merge pull request #787 from tdawson/2015-11-split-inventory | Troy Dawson | 2015-11-02 | 1 | -1/+23 |
| |\ \ \ \ | | | | | | | | | | | | | split inventory into subpackages | ||||
| | * | | | | split inventory into subpackages | Troy Dawson | 2015-11-02 | 1 | -1/+23 |
| |/ / / / | |||||
| * | | | | Merge pull request #777 from brenton/uninstall | Brenton Leanhardt | 2015-10-30 | 1 | -0/+14 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Attempt to remove the various interfaces left over from an install | ||||
| | * | | | Attempt to remove the various interfaces left over from an install | Brenton Leanhardt | 2015-10-30 | 1 | -0/+14 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing br0 won't work if openvswitch has already been stopped. ovs-system will be left around but that is just a problem with openvswitch's packaging. That device is apparently not even used. In the worst case a manual reboot will remove all of these devices. | ||||
| * | | | Automatic commit of package [openshift-ansible] release [3.0.6-1]. | Kenny Woodson | 2015-10-30 | 2 | -2/+9 |
| | | | | |||||
| * | | | Merge pull request #776 from kwoodson/rpmdeps | Kenny Woodson | 2015-10-30 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Updating openshift-ansible-inventory to require python-boto and python-libcloud | ||||
| | * | | | Adding python-boto and python-libcloud to openshift-ansible-inventory dependency | Kenny Woodson | 2015-10-30 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #775 from abutcher/specific-version | Brenton Leanhardt | 2015-10-30 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Use more specific enterprise version for version_greater_than_3_1 | ||||
| | * | | Use more specific enterprise version for version_greater_than_3_1_or_1_1. | Andrew Butcher | 2015-10-30 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #766 from brenton/master | Brenton Leanhardt | 2015-10-29 | 1 | -0/+4 |
| |\ \ | | | | | | | | | Conditionalizing the support for the v1beta3 api | ||||
| | * | | Conditionalizing the support for the v1beta3 api | Brenton Leanhardt | 2015-10-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | v1beta3 is only supported on OSE 3.0. For 3.0 the deployment_type was "enterprise" | ||||
| * | | | Automatic commit of package [openshift-ansible] release [3.0.5-1]. | Kenny Woodson | 2015-10-29 | 2 | -2/+16 |
| | | | | |||||
| * | | | Merge pull request #770 from kwoodson/multi_fix | Kenny Woodson | 2015-10-29 | 1 | -15/+16 |
| |\ \ \ | | | | | | | | | | | Updating multi_ec2 to support extra_vars and extra_groups | ||||
| | * | | | Updating multi_ec2 to support extra_vars and extra_groups | Kenny Woodson | 2015-10-29 | 1 | -15/+16 |
| |/ / / | |||||
| * | | | Merge pull request #768 from kwoodson/invenfix | Kenny Woodson | 2015-10-29 | 2 | -29/+4 |
| |\ \ \ | | |/ / | |/| | | Removing j2 and adding to_nice_yaml. | ||||
| | * | | Removing the template and doing to_nice_yaml instead | Kenny Woodson | 2015-10-29 | 2 | -29/+4 |
| | | | | |||||
| * | | | Merge pull request #764 from cgwalters/readme-aep | Brenton Leanhardt | 2015-10-29 | 1 | -18/+9 |
| |\ \ \ | | | | | | | | | | | README_AEP: Various fixes | ||||
| | * | | | README_AEP: Various fixes | Colin Walters | 2015-10-29 | 1 | -18/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix deployment_type to be atomic-enterpri - Note in oreg_url that the names may change - Drop the COPR as it doesn't apply for AEP right now - The `openshift_additional_repos` needs to be on a single line or Ansible will error out (with `ansible-1.9.2-1.el7` at least) - Change the hostnames to be `aep` to be clearer what we have - We no longer have a separate git repository | ||||
| * | | | | Merge pull request #765 from jlebon/pr/fix-router-registry | Brenton Leanhardt | 2015-10-29 | 1 | -4/+6 |
| |\ \ \ \ | | |_|/ / | |/| | | | README_AEP.md: update instructions for creating router and registry | ||||
| | * | | | README_AEP.md: update instructions for creating router and registry | Jonathan Lebon | 2015-10-29 | 1 | -4/+6 |
| | |/ / | |||||
| * | | | Merge pull request #738 from detiber/storage_plugins | Brenton Leanhardt | 2015-10-29 | 7 | -4/+53 |
| |\ \ \ | | | | | | | | | | | Install storage plugin dependencies | ||||
| | * | | | make storage_plugin_deps conditional on deployment_type | Jason DeTiberus | 2015-10-27 | 1 | -17/+9 |
| | | | | | |||||
| | * | | | remove debugging pauses | Jason DeTiberus | 2015-10-26 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | make storage plugin dependency installation more flexible | Jason DeTiberus | 2015-10-26 | 7 | -18/+64 |
| | | | | | |||||
| | * | | | Install storage plugin dependencies | Jason DeTiberus | 2015-10-26 | 1 | -2/+17 |
| | | | | | |||||
| * | | | | Merge pull request #759 from kwoodson/minventory | Kenny Woodson | 2015-10-28 | 1 | -3/+3 |
| |\ \ \ \ | | |_|/ / | |/| | | | Fixed rename for extra_vars. | ||||
| | * | | | Fixing for extra_vars rename. | Kenny Woodson | 2015-10-28 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Automatic commit of package [openshift-ansible] release [3.0.4-1]. | Kenny Woodson | 2015-10-28 | 2 | -2/+23 |
| | | | | | |||||
| * | | | | Merge pull request #758 from kwoodson/specclean | Kenny Woodson | 2015-10-28 | 2 | -242/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Removing spec files for bin and inventory. | ||||
| | * | | | | Removing spec files. | Kenny Woodson | 2015-10-28 | 2 | -242/+0 |
| |/ / / / | |||||
| * | | | | Merge pull request #757 from kwoodson/extravars | Kenny Woodson | 2015-10-28 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Updating example for multi inventory. | ||||
| | * | | | | Updated example | Kenny Woodson | 2015-10-28 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Automatic commit of package [openshift-ansible-inventory] release [0.0.11-1]. | Kenny Woodson | 2015-10-28 | 2 | -2/+5 |
| | | | | | |||||
| * | | | | Automatic commit of package [openshift-ansible-bin] release [0.0.21-1]. | Kenny Woodson | 2015-10-28 | 2 | -2/+5 |
| | | | | | |||||
| * | | | | Merge pull request #746 from detiber/multitenantNetwork | Brenton Leanhardt | 2015-10-28 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | | | add examples for SDN configuration | ||||
| | * | | | | add examples for SDN configuration | Jason DeTiberus | 2015-10-26 | 1 | -0/+6 |
| | | |/ / | | |/| | | |||||
| * | | | | Automatic commit of package [openshift-ansible-inventory] release [0.0.10-1]. | Kenny Woodson | 2015-10-28 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | Automatic commit of package [openshift-ansible-bin] release [0.0.20-1]. | Kenny Woodson | 2015-10-28 | 2 | -1/+5 |
| | | | | | |||||
| * | | | | Merge pull request #753 from kwoodson/minven | Kenny Woodson | 2015-10-28 | 1 | -8/+19 |
| |\ \ \ \ | | | | | | | | | | | | | Fixing multi_ec2 with clone_vars, clone_groups, and renamed hostvars to extra_vars. | ||||
| | * | | | | Adding clone vars and groups. Renamed hostvars to extra_vars. | Kenny Woodson | 2015-10-28 | 1 | -8/+19 |
| | | | | | | |||||
| * | | | | | Merge pull request #752 from brenton/master | Brenton Leanhardt | 2015-10-28 | 1 | -0/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Adding tito releasers configuration | ||||
| | * | | | | | Adding tito releasers configuration | Brenton Leanhardt | 2015-10-28 | 1 | -0/+13 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #755 from brenton/uninstall | Brenton Leanhardt | 2015-10-28 | 1 | -2/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Bug fixes for the uninstall playbook |