Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1078 from joelddiaz/master | Joel Diaz | 2015-12-16 | 9 | -59/+113 |
|\ | | | | | sync master -> prod | ||||
| * | Merge pull request #1074 from joelddiaz/zagg-client-ovs | Joel Diaz | 2015-12-16 | 1 | -1/+1 |
| |\ | | | | | | | change ovs mount to /var/run/openvswitch | ||||
| | * | change ovs mount to /var/run/openvswitch | Joel Diaz | 2015-12-16 | 1 | -1/+1 |
| |/ | | | | | | | will not require a container restart if openvswitch service is restarted | ||||
| * | Merge pull request #1073 from twiest/pr | Thomas Wiest | 2015-12-16 | 1 | -3/+13 |
| |\ | | | | | | | split zagg.server.processor.errors into separate heartbeat and metrics error items (needed since the scripts are split now). | ||||
| | * | split zagg.server.processor.errors into separate heartbeat and metrics error ↵ | Thomas Wiest | 2015-12-16 | 1 | -3/+13 |
| |/ | | | | | | | items (needed since the scripts are split now). | ||||
| * | Merge pull request #1069 from joelddiaz/docker-dns | Joel Diaz | 2015-12-15 | 1 | -0/+10 |
| |\ | | | | | | | Add zabbix values to track docker container DNS results | ||||
| | * | Add zabbix values to track docker container DNS results | Joel Diaz | 2015-12-15 | 1 | -0/+10 |
| | | | |||||
| * | | Merge pull request #1067 from dgoodwin/node-registry-bug | Thomas Wiest | 2015-12-15 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Fix registry modification for new deployment types. | ||||
| | * | | Fix registry modification for new deployment types. | Devan Goodwin | 2015-12-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | New deployment types were missed when installing with additional docker registries. | ||||
| * | | | Merge pull request #1057 from EricMountain-1A/fix-node-network-fail-4github | Thomas Wiest | 2015-12-15 | 2 | -4/+4 |
| |\ \ \ | | |/ / | |/| | | Fix typos that cause master/node restarts which break openshift SDN setup | ||||
| | * | | Fixes typo when setting facts to record whether master/node has been ↵ | Eric Mountain | 2015-12-14 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | restarted already, to decide whether notify handler should do so or not. Currently, this causes random SDN network setup failures as openshift-node gets restarted while the setup script is running, and the subsequent start fails to configure the SDN because it thinks it's already done. | ||||
| * | | | Merge pull request #1064 from kwoodson/ohifix | Kenny Woodson | 2015-12-14 | 3 | -49/+75 |
| |\ \ \ | | | | | | | | | | | Adding option for cache reading and specify openshift version. | ||||
| | * | | | Updates to ohi to pull cache if specified. Also require version | Kenny Woodson | 2015-12-14 | 3 | -49/+75 |
| | | | | | |||||
| * | | | | Merge pull request #1063 from mwoodson/create_app | Matt Woodson | 2015-12-14 | 1 | -0/+8 |
| |\ \ \ \ | | | | | | | | | | | | | Zabbix: added trigger to monitor app create over the last hour | ||||
| | * | | | | Zabbix: added trigger to monitor app create over the last hour | Matt Woodson | 2015-12-14 | 1 | -0/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #1059 from twiest/master | Thomas Wiest | 2015-12-14 | 111 | -482/+590 |
|\| | | | | | | | | | | | | | | sync master -> prod branch | ||||
| * | | | | Merge pull request #1054 from twiest/pr | Thomas Wiest | 2015-12-14 | 2 | -0/+49 |
| |\ \ \ \ | | |/ / / | |/| | | | added 'Template Zagg Server' | ||||
| | * | | | added 'Template Zagg Server' | Thomas Wiest | 2015-12-14 | 2 | -0/+49 |
| |/ / / | |||||
| * | | | Merge pull request #1028 from kwoodson/remove_env_host_type | Kenny Woodson | 2015-12-14 | 38 | -135/+139 |
| |\ \ \ | | |/ / | |/| | | Removing env-host-type in preparation of env and environment changes. | ||||
| | * | | Updating env-host-type to host patterns | Kenny Woodson | 2015-12-11 | 38 | -135/+139 |
| | | | | |||||
| * | | | Merge pull request #1052 from abutcher/controllers-service | Brenton Leanhardt | 2015-12-13 | 2 | -6/+1 |
| |\ \ \ | | | | | | | | | | | Change controllers service type to simple. | ||||
| | * | | | Change controllers service type to simple. | Andrew Butcher | 2015-12-11 | 2 | -6/+1 |
| |/ / / | |||||
| * | | | Merge pull request #954 from damaestro/update_latest_cloud_image | Thomas Wiest | 2015-12-10 | 4 | -5/+16 |
| |\ \ \ | | | | | | | | | | | Update for latest CentOS-7-x86_64-GenericCloud. | ||||
| | * | | | Use join for the uncompress command. | Jonathan Steffan | 2015-11-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update for latest CentOS-7-x86_64-GenericCloud. | Jonathan Steffan | 2015-11-22 | 4 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use xz compressed image - Update sha256 for new image - Update docs to reflect new settings | ||||
| * | | | | Merge pull request #1000 from detiber/localhostFix | Thomas Wiest | 2015-12-10 | 43 | -11/+112 |
| |\ \ \ \ | | | | | | | | | | | | | Enforce connection: local and become: no on all localhost plays | ||||
| | * | | | | Enforce connection: local and become: no on all localhost plays | Jason DeTiberus | 2015-11-30 | 43 | -11/+112 |
| | | | | | | |||||
| * | | | | | Merge pull request #1045 from maxamillion/fedora | Thomas Wiest | 2015-12-10 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add note that Fedora 23+ is acceptable deployment target for origin | ||||
| | * | | | | | Add note that Fedora 23+ is acceptable deployment target for origin | Adam Miller | 2015-12-09 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1]. | Thomas Wiest | 2015-12-10 | 2 | -2/+18 |
| | | | | | | | |||||
| * | | | | | | Revert "Automatic commit of package [openshift-ansible] release [3.0.20-1]." | Thomas Wiest | 2015-12-10 | 2 | -14/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit be8f7c3c96dd077a10b71447c513811203673028. | ||||
| * | | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1]. | Thomas Wiest | 2015-12-10 | 2 | -2/+14 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #1044 from joelddiaz/zbx-action | Joel Diaz | 2015-12-10 | 1 | -6/+120 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | add support for remote command actions | ||||
| | * | | | | | add support for remote command actions | Joel Diaz | 2015-12-09 | 1 | -6/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | no support for anything but custom scripts at this time | ||||
| * | | | | | | Merge pull request #1030 from jtslear/make-examples-optional | Brenton Leanhardt | 2015-12-10 | 7 | -2/+21 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make the install of openshift_examples optional | ||||
| | * | | | | | | Make the install of openshift_examples optional | John T Skarbek | 2015-12-09 | 7 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allows us to make it optional to run the role `openshift_examples` * Defaults to true | ||||
| * | | | | | | | Merge pull request #1051 from abutcher/versions | Brenton Leanhardt | 2015-12-10 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Install base package in openshift_common for version facts | ||||
| | * | | | | | | | Install base package in openshift_common for version facts | Andrew Butcher | 2015-12-10 | 1 | -0/+6 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1046 from sdodson/yum-dnf-cleanup | Brenton Leanhardt | 2015-12-09 | 36 | -316/+107 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove yum / dnf duplication | ||||
| | * | | | | | | | Remove yum / dnf duplication | Scott Dodson | 2015-12-09 | 36 | -316/+107 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1049 from abutcher/uninstall-hacluster | Brenton Leanhardt | 2015-12-09 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove hacluster user during uninstall. | ||||
| | * | | | | | | | Remove hacluster user during uninstall. | Andrew Butcher | 2015-12-09 | 1 | -0/+2 |
| | | |_|/ / / / | | |/| | | | | | |||||
* | | | | | | | | Merge pull request #1048 from twiest/prod | Thomas Wiest | 2015-12-09 | 226 | -809/+27305 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Sync master -> Prod | ||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into prod | Thomas Wiest | 2015-12-09 | 226 | -809/+27305 |
|/| | | | | | | | | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1043 from abutcher/session_vars | Brenton Leanhardt | 2015-12-09 | 1 | -10/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Simplify session secrets overrides. | ||||
| | * | | | | | | | Simplify session secrets overrides. | Andrew Butcher | 2015-12-09 | 1 | -10/+2 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1037 from sdodson/ansible194 | Brenton Leanhardt | 2015-12-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Bump ansible requirement to 1.9.4 | ||||
| | * | | | | | | Bump ansible requirement to 1.9.4 | Scott Dodson | 2015-12-08 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge pull request #1040 from abutcher/pacemaker-pass | Brenton Leanhardt | 2015-12-09 | 1 | -7/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Squash pcs install into one task. | ||||
| | * | | | | | | Squash pcs install into one task. | Andrew Butcher | 2015-12-09 | 1 | -7/+2 |
| | | |/ / / / | | |/| | | | |