summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'openshift/master'Diego Castro2015-08-134-1/+32
|\
| * Merge pull request #416 from spinolacastro/fix_labelsWesley Hearn2015-08-124-1/+32
|/| | | | | Fix node labeling. Issue #305
| * Notes for schedule behavior.Diego Castro (dscastro)2015-08-121-0/+12
| |
| * Don't try to label node if there's no labelsDiego Castro2015-08-101-0/+2
| |
| * Fix node labelsDiego Castro2015-08-102-7/+3
| |
| * Applying changes suggested by @sdodsonDiego Castro (dscastro)2015-08-041-3/+3
| |
| * Fix node labeling. Issue #305Diego Castro2015-08-043-1/+22
| |
* | Merge pull request #429 from spinolacastro/custom_corsBrenton Leanhardt2015-08-123-1/+7
|\ \ | | | | | | Custom cors configuration
| * | Fix Custom CorsDiego Castro2015-08-123-1/+7
| |/
* | Merge pull request #454 from kwoodson/cleanupKenny Woodson2015-08-125-84/+2
|\ \ | | | | | | zbx_item fix and removed files
| * | zbx item now uses key as default name. Clean up.Kenny Woodson2015-08-125-84/+2
|/ /
* | Merge pull request #451 from kwoodson/completionKenny Woodson2015-08-124-8/+29
|\ \ | | | | | | bash completion fix.
| * | Updated to read config first and default to users home dirKenny Woodson2015-08-124-8/+29
|/ /
* | Merge pull request #440 from lhuard1A/infra_node_support_openstackThomas Wiest2015-08-123-11/+105
|\ \ | | | | | | Infra node support for OpenStack
| * | Infra node support for OpenStackLénaïc Huard2015-08-123-11/+105
| | |
* | | Merge pull request #381 from pat2man/aws-fixesThomas Wiest2015-08-122-3/+42
|\ \ \ | | | | | | | | Switch to Centos and enable SDN on origin.
| * | | Switch to Centos and enable SDN on origin.Patrick Tescher2015-07-222-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | Fedora 21 doesn’t seem to have docker 1.6.2. Centos does. Also without SDN networking was not working on AWS.
* | | | Merge pull request #441 from lhuard1A/ansible_host_key_checking_falseThomas Wiest2015-08-121-0/+10
|\ \ \ \ | | | | | | | | | | Prevent Ansible from serializing tasks
| * | | | Prevent Ansible from serializing tasksLénaïc Huard2015-08-111-0/+10
| | |/ / | |/| | | | | | | | | | even if the ssh known_host file misses the ssh public host keys of the servers.
* | | | Merge pull request #446 from kwoodson/idemKenny Woodson2015-08-1117-676/+1406
|\ \ \ \ | | | | | | | | | | Zabbix Idempotent module
| * | | | Zabbix IdempotencyKenny Woodson2015-08-1117-676/+1406
| | | | |
* | | | | Merge pull request #445 from mwoodson/remove_monitorMatt Woodson2015-08-113-133/+0
|\ \ \ \ \ | |/ / / / |/| | | | removed deploy monitoring containders
| * | | | removed deploy monitoring containdersMatt Woodson2015-08-113-133/+0
|/ / / /
* | | | Merge pull request #442 from lhuard1A/infra_node_support_libvirtWesley Hearn2015-08-111-1/+1
|\ \ \ \ | |/ / / |/| | | Fix infra node support on libvirt
| * | | Fix infra node support on libvirtLénaïc Huard2015-08-111-1/+1
|/ / /
* | | Merge pull request #439 from wshearn/online_use_offical_registryWesley Hearn2015-08-101-2/+1
|\ \ \ | | | | | | | | Use the official redhat registry for online
| * | | Use the official redhat registry for onlineWesley Hearn2015-08-101-2/+1
|/ / /
* | | Merge pull request #435 from dak1n1/numnode_pauseStefanie Forrester2015-08-071-2/+2
|\ \ \ | | | | | | | | take number of nodes into account when pausing
| * | | take number of nodes into account when pausingStefanie Forrester2015-08-071-2/+2
|/ / /
* | | Merge pull request #431 from dak1n1/tdagent_pauseStefanie Forrester2015-08-061-0/+3
|\ \ \ | | | | | | | | added pause before td-agent restart
| * | | added pause before td-agent restartStefanie Forrester2015-08-061-0/+3
| | | |
* | | | Merge pull request #432 from kwoodson/exampleKenny Woodson2015-08-061-0/+8
|\ \ \ \ | |/ / / |/| | | Added example
| * | | example addedKenny Woodson2015-08-061-0/+8
|/ / /
* | | Merge pull request #430 from sdodson/revert-423-namespace-inventoryBrenton Leanhardt2015-08-065-18/+18
|\ \ \ | | | | | | | | Revert "namespace the byo inventory so the group names aren't so gene…
| * | | Revert "namespace the byo inventory so the group names aren't so generic"Scott Dodson2015-08-065-18/+18
|/ / /
* | | Merge pull request #427 from sdodson/500ms-heartbeatBrenton Leanhardt2015-08-051-2/+2
|\ \ \ | | | | | | | | Reduce heartbeat frequency to 500ms to reduce etcd cpu load
| * | | Reduce heartbeat frequency to 500ms to reduce etcd cpu loadScott Dodson2015-08-051-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Per https://github.com/coreos/etcd/pull/3097 reduce heartbeat to 500ms until we can ensure etcd 2.1 is in use Reduces the impact of but doesn't fix BZ1250310
* | | Merge pull request #423 from maxamillion/namespace-inventoryWesley Hearn2015-08-055-18/+18
|\ \ \ | | | | | | | | namespace the byo inventory so the group names aren't so generic
| * | | namespace the byo inventory so the group names aren't so genericAdam Miller2015-08-055-18/+18
| | |/ | |/|
* | | Merge pull request #413 from kwoodson/createpvKenny Woodson2015-08-052-0/+150
|\ \ \ | | | | | | | | Adding a playbook to create pv ebs
| * | | Added a pv creation scriptKenny Woodson2015-08-052-0/+150
| |/ /
* | | Merge pull request #421 from wshearn/increase_diskWesley Hearn2015-08-051-1/+1
|\ \ \ | |/ / |/| | Increase disk size for AWS
| * | Increase disk size for AWSWesley Hearn2015-08-051-1/+1
|/ /
* | Merge pull request #409 from abutcher/ldap-identity-providerBrenton Leanhardt2015-08-031-0/+14
|\ \ | | | | | | Add LDAPPasswordIdentityProvider bits to identity_provider_config macro.
| * | Add LDAPPasswordIdentityProvider bits to identity_provider_config macro.Andrew Butcher2015-07-311-0/+14
|/ /
* | Merge pull request #400 from detiber/addSubdomainConfigThomas Wiest2015-07-313-1/+5
|\ \ | | | | | | Add support for setting routingConfig:subdomain
| * | Add support for setting routingConfig:subdomainJason DeTiberus2015-07-283-1/+5
| | |
* | | Merge pull request #404 from maxamillion/fix_registry_docsThomas Wiest2015-07-311-2/+5
|\ \ \ | | | | | | | | add link to persistent storage config docs for docker-registry
| * | | add link to persistent storage config docs for docker-registryAdam Miller2015-07-291-2/+5
| | | |
* | | | Merge pull request #395 from pat2man/m4_aws_instancesWesley Hearn2015-07-306-18/+18
|\ \ \ \ | |/ / / |/| | | Use AWS m4 instances types