Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1086 from sdodson/xpaas-1.2-jboss-fuse | Thomas Wiest | 2015-12-17 | 42 | -458/+6825 |
|\ | | | | | Xpaas 1.2 and JBOSS Fuse examples | ||||
| * | Add jboss-fuse/application-templates/fis-image-streams.json | Scott Dodson | 2015-12-17 | 2 | -0/+57 |
| | | |||||
| * | Update from jboss-openshift/application-templates ose-v1.2.0-1 | Scott Dodson | 2015-12-17 | 41 | -458/+6768 |
| | | |||||
* | | Merge pull request #1065 from lebauce/flannel-fixes | Brenton Leanhardt | 2015-12-17 | 1 | -0/+1 |
|\ \ | | | | | | | Use inventory value when checking for flannel | ||||
| * | | Properly set use_flannel fact | Sylvain Baubeau | 2015-12-16 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1085 from smunilla/fix_test_fresh_install_with_config | Brenton Leanhardt | 2015-12-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | atomic-openshift-installer: Fix broken nosetest | ||||
| * | | | atomic-openshift-installer: Fix broken nosetest | Samuel Munilla | 2015-12-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This is a fix for the failing test_fresh_install_with_config. | ||||
* | | | | Merge pull request #1091 from joelddiaz/dns-average | Joel Diaz | 2015-12-17 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | change dns triggers to average | ||||
| * | | | | change dns triggers to average | Joel Diaz | 2015-12-17 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #1089 from joelddiaz/docker-dns-existing | Joel Diaz | 2015-12-17 | 1 | -0/+10 |
|\ \ \ \ | |_|_|/ |/| | | | add item/trigger for dns tests on all currently running containers | ||||
| * | | | add item/trigger for dns tests on all currently running containers | Joel Diaz | 2015-12-17 | 1 | -0/+10 |
|/ / / | |||||
* | | | Merge pull request #1084 from joelddiaz/docker-dns-trigger | Joel Diaz | 2015-12-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | fix logic to tolerate occasional failures | ||||
| * | | fix logic to tolerate occasional failures | Joel Diaz | 2015-12-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1062 from smunilla/3.0_ha_hint | Brenton Leanhardt | 2015-12-16 | 2 | -10/+29 |
|\ \ \ | | | | | | | | | atomic-openshift-installer: Remove HA hint for 3.0 install | ||||
| * | | | quick installer tests | Samuel Munilla | 2015-12-16 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | Add test for not displaying HA hints for 3.0 installs | ||||
| * | | | atomic-openshift-installer: Remove HA hint for 3.0 install | Samuel Munilla | 2015-12-16 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | Small update to remove the hint for multiple masters if we are doing a 3.0 installation. | ||||
* | | | | Merge pull request #1076 from sdodson/versions | Thomas Wiest | 2015-12-16 | 1 | -3/+2 |
|\ \ \ \ | | | | | | | | | | | Clean up versions.sh | ||||
| * | | | | Clean up versions.sh | Scott Dodson | 2015-12-16 | 1 | -3/+2 |
| |/ / / | |||||
* | | | | 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 #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 |