summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1078 from joelddiaz/masterJoel Diaz2015-12-169-59/+113
|\ | | | | sync master -> prod
| * Merge pull request #1074 from joelddiaz/zagg-client-ovsJoel Diaz2015-12-161-1/+1
| |\ | | | | | | change ovs mount to /var/run/openvswitch
| | * change ovs mount to /var/run/openvswitchJoel Diaz2015-12-161-1/+1
| |/ | | | | | | will not require a container restart if openvswitch service is restarted
| * Merge pull request #1073 from twiest/prThomas Wiest2015-12-161-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 Wiest2015-12-161-3/+13
| |/ | | | | | | items (needed since the scripts are split now).
| * Merge pull request #1069 from joelddiaz/docker-dnsJoel Diaz2015-12-151-0/+10
| |\ | | | | | | Add zabbix values to track docker container DNS results
| | * Add zabbix values to track docker container DNS resultsJoel Diaz2015-12-151-0/+10
| | |
| * | Merge pull request #1067 from dgoodwin/node-registry-bugThomas Wiest2015-12-151-2/+2
| |\ \ | | | | | | | | Fix registry modification for new deployment types.
| | * | Fix registry modification for new deployment types.Devan Goodwin2015-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | New deployment types were missed when installing with additional docker registries.
| * | | Merge pull request #1057 from EricMountain-1A/fix-node-network-fail-4githubThomas Wiest2015-12-152-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 Mountain2015-12-142-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/ohifixKenny Woodson2015-12-143-49/+75
| |\ \ \ | | | | | | | | | | Adding option for cache reading and specify openshift version.
| | * | | Updates to ohi to pull cache if specified. Also require versionKenny Woodson2015-12-143-49/+75
| | | | |
| * | | | Merge pull request #1063 from mwoodson/create_appMatt Woodson2015-12-141-0/+8
| |\ \ \ \ | | | | | | | | | | | | Zabbix: added trigger to monitor app create over the last hour
| | * | | | Zabbix: added trigger to monitor app create over the last hourMatt Woodson2015-12-141-0/+8
| |/ / / /
* | | | | Merge pull request #1059 from twiest/masterThomas Wiest2015-12-14111-482/+590
|\| | | | | | | | | | | | | | sync master -> prod branch
| * | | | Merge pull request #1054 from twiest/prThomas Wiest2015-12-142-0/+49
| |\ \ \ \ | | |/ / / | |/| | | added 'Template Zagg Server'
| | * | | added 'Template Zagg Server'Thomas Wiest2015-12-142-0/+49
| |/ / /
| * | | Merge pull request #1028 from kwoodson/remove_env_host_typeKenny Woodson2015-12-1438-135/+139
| |\ \ \ | | |/ / | |/| | Removing env-host-type in preparation of env and environment changes.
| | * | Updating env-host-type to host patternsKenny Woodson2015-12-1138-135/+139
| | | |
| * | | Merge pull request #1052 from abutcher/controllers-serviceBrenton Leanhardt2015-12-132-6/+1
| |\ \ \ | | | | | | | | | | Change controllers service type to simple.
| | * | | Change controllers service type to simple.Andrew Butcher2015-12-112-6/+1
| |/ / /
| * | | Merge pull request #954 from damaestro/update_latest_cloud_imageThomas Wiest2015-12-104-5/+16
| |\ \ \ | | | | | | | | | | Update for latest CentOS-7-x86_64-GenericCloud.
| | * | | Use join for the uncompress command.Jonathan Steffan2015-11-221-1/+1
| | | | |
| | * | | Update for latest CentOS-7-x86_64-GenericCloud.Jonathan Steffan2015-11-224-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use xz compressed image - Update sha256 for new image - Update docs to reflect new settings
| * | | | Merge pull request #1000 from detiber/localhostFixThomas Wiest2015-12-1043-11/+112
| |\ \ \ \ | | | | | | | | | | | | Enforce connection: local and become: no on all localhost plays
| | * | | | Enforce connection: local and become: no on all localhost playsJason DeTiberus2015-11-3043-11/+112
| | | | | |
| * | | | | Merge pull request #1045 from maxamillion/fedoraThomas Wiest2015-12-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Add note that Fedora 23+ is acceptable deployment target for origin
| | * | | | | Add note that Fedora 23+ is acceptable deployment target for originAdam Miller2015-12-091-1/+1
| | | | | | |
| * | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1].Thomas Wiest2015-12-102-2/+18
| | | | | | |
| * | | | | | Revert "Automatic commit of package [openshift-ansible] release [3.0.20-1]."Thomas Wiest2015-12-102-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit be8f7c3c96dd077a10b71447c513811203673028.
| * | | | | | Automatic commit of package [openshift-ansible] release [3.0.20-1].Thomas Wiest2015-12-102-2/+14
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #1044 from joelddiaz/zbx-actionJoel Diaz2015-12-101-6/+120
| |\ \ \ \ \ | | | | | | | | | | | | | | add support for remote command actions
| | * | | | | add support for remote command actionsJoel Diaz2015-12-091-6/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | no support for anything but custom scripts at this time
| * | | | | | Merge pull request #1030 from jtslear/make-examples-optionalBrenton Leanhardt2015-12-107-2/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Make the install of openshift_examples optional
| | * | | | | | Make the install of openshift_examples optionalJohn T Skarbek2015-12-097-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allows us to make it optional to run the role `openshift_examples` * Defaults to true
| * | | | | | | Merge pull request #1051 from abutcher/versionsBrenton Leanhardt2015-12-101-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Install base package in openshift_common for version facts
| | * | | | | | | Install base package in openshift_common for version factsAndrew Butcher2015-12-101-0/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #1046 from sdodson/yum-dnf-cleanupBrenton Leanhardt2015-12-0936-316/+107
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove yum / dnf duplication
| | * | | | | | | Remove yum / dnf duplicationScott Dodson2015-12-0936-316/+107
| |/ / / / / / /
| * | | | | | | Merge pull request #1049 from abutcher/uninstall-haclusterBrenton Leanhardt2015-12-091-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove hacluster user during uninstall.
| | * | | | | | | Remove hacluster user during uninstall.Andrew Butcher2015-12-091-0/+2
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge pull request #1048 from twiest/prodThomas Wiest2015-12-09226-809/+27305
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Sync master -> Prod
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into prodThomas Wiest2015-12-09226-809/+27305
|/| | | | | | | | | |/ / / / / / /
| * | | | | | | Merge pull request #1043 from abutcher/session_varsBrenton Leanhardt2015-12-091-10/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Simplify session secrets overrides.
| | * | | | | | | Simplify session secrets overrides.Andrew Butcher2015-12-091-10/+2
| | |/ / / / / /
| * | | | | | | Merge pull request #1037 from sdodson/ansible194Brenton Leanhardt2015-12-091-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Bump ansible requirement to 1.9.4
| | * | | | | | Bump ansible requirement to 1.9.4Scott Dodson2015-12-081-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #1040 from abutcher/pacemaker-passBrenton Leanhardt2015-12-091-7/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Squash pcs install into one task.
| | * | | | | | Squash pcs install into one task.Andrew Butcher2015-12-091-7/+2
| | | |/ / / / | | |/| | | |