summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #513 from kwoodson/zbxupdatesWesley Hearn2015-08-2738-334/+682
|\ | | | | Zabbix API updates
| * Updates for zbx ans moduleKenny Woodson2015-08-2738-334/+682
| |
* | Merge pull request #459 from spinolacastro/fluentdWesley Hearn2015-08-272-0/+4
|\ \ | | | | | | Configure Fluentd
| * | Remove extra space.Diego Castro (dscastro)2015-08-261-1/+1
| | |
| * | Revert Fluentd FactsDiego Castro2015-08-141-1/+2
| | |
| * | Configure FluentdDiego Castro2015-08-123-2/+5
| | |
* | | Merge pull request #516 from detiber/docker_registry_fixWesley Hearn2015-08-271-11/+13
|\ \ \ | | | | | | | | Bugfix for extra --add-registry in docker config
| * | | Bugfix for extra --add-registry in docker configJason DeTiberus2015-08-261-11/+13
|/ / /
* | | Merge pull request #509 from lhuard1A/configure_docker_registriesWesley Hearn2015-08-262-0/+45
|\ \ \ | | | | | | | | Add options to configure docker registries
| * | | Add options to configure docker registriesLénaïc Huard2015-08-262-0/+45
| | | |
* | | | Merge pull request #483 from lhuard1A/issue_471Wesley Hearn2015-08-265-79/+43
|\ \ \ \ | | | | | | | | | | Properly pass the "external network" option to the HEAT template
| * | | | Properly pass the "external network" option to the HEAT templateLénaïc Huard2015-08-175-79/+43
| | | | | | | | | | | | | | | | | | | | Fixes #471
* | | | | Merge pull request #498 from sdodson/bz1248376Wesley Hearn2015-08-2620-140/+540
|\ \ \ \ \ | | | | | | | | | | | | Update latest openshift examples
| * | | | | Add jenkins image stream and quickstartScott Dodson2015-08-265-20/+357
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/openshift/origin/pull/4145
| * | | | | Update latest openshift examplesScott Dodson2015-08-2015-120/+183
| | |_|_|/ | |/| | |
* | | | | Merge pull request #510 from lhuard1A/clustered_etcd_libvirtWesley Hearn2015-08-262-2/+11
|\ \ \ \ \ | | | | | | | | | | | | Add etcd nodes management in libvirt
| * | | | | Add etcd nodes management in libvirtLénaïc Huard2015-08-252-2/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #511 from wshearn/label_aws_hostsWesley Hearn2015-08-261-0/+13
|\ \ \ \ \ | | | | | | | | | | | | Set node labels for AWS hosts
| * | | | | Set node labels for AWS hostsWesley Hearn2015-08-251-0/+13
| |/ / / /
* | | | | Merge pull request #462 from spinolacastro/clustermetricsWesley Hearn2015-08-2612-0/+274
|\ \ \ \ \ | | | | | | | | | | | | Cluster Metrics
| * | | | | Add README and inventory example.Diego Castro2015-08-152-0/+39
| | | | | |
| * | | | | Configure cluster metricsDiego Castro2015-08-1310-0/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playbook based on https://docs.openshift.org/latest/admin_guide/cluster_metrics.html.
| * | | | | Merge remote-tracking branch 'openshift/master'Diego Castro2015-08-134-1/+32
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #503 from detiber/fixKubeArgsBrenton Leanhardt2015-08-261-8/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | fix apiServerArguments and controllerServerArguments
| * | | | | Fix quoting around nullJason DeTiberus2015-08-221-2/+2
| | | | | |
| * | | | | fix apiServerArguments and controllerServerArgumentsJason DeTiberus2015-08-221-8/+2
|/ / / / /
* | | | | Merge pull request #500 from jim-minter/fix-etcd-ca-lifetimeBrenton Leanhardt2015-08-211-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Make CA lifetime 365 days, not 30
| * | | | Make CA lifetime 365 days, not 30Jim Minter2015-08-211-0/+1
|/ / / /
* | | | Merge pull request #496 from kwoodson/zbxsetupMatt Woodson2015-08-202-4/+40
|\ \ \ \ | | | | | | | | | | Playbook for updating users during zabbix setup.
| * | | | fixed zbx_user. Update password playbook addedKenny Woodson2015-08-202-4/+40
|/ / / /
* | | | Automatic commit of package [openshift-ansible-inventory] release [0.0.9-1].Kenny Woodson2015-08-202-2/+28
| | | |
* | | | Automatic commit of package [openshift-ansible-bin] release [0.0.19-1].Kenny Woodson2015-08-202-2/+20
| | | |
* | | | Merge pull request #495 from kwoodson/pvfix1Kenny Woodson2015-08-191-0/+10
|\ \ \ \ | | | | | | | | | | tagging pv
| * | | | Added tagging to the pv volumesKenny Woodson2015-08-191-0/+10
|/ / / /
* | | | Merge pull request #493 from kwoodson/pvfixKenny Woodson2015-08-191-0/+7
|\ \ \ \ | | | | | | | | | | fstab cleanup after pv creation
| * | | | remove fstab entry after pv creationKenny Woodson2015-08-191-0/+7
|/ / / /
* | | | Merge pull request #491 from detiber/masterBrenton Leanhardt2015-08-181-1/+1
|\ \ \ \ | | | | | | | | | | another kubelet_args fix
| * | | | another kubelet_args fixJason DeTiberus2015-08-181-1/+1
| | | | |
* | | | | Merge pull request #490 from detiber/masterBrenton Leanhardt2015-08-181-2/+2
|\| | | | | | | | | | | | | | Fix kubelet_args
| * | | | Fix kubelet_argsJason DeTiberus2015-08-181-2/+2
| | | | |
* | | | | Merge pull request #487 from detiber/bz1252337Brenton Leanhardt2015-08-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Bug 1252337 - Fix for quote error in oauthConfig template
| * | | | Bug 1252337 - Fix for quote error in oauthConfig templateJason DeTiberus2015-08-171-1/+1
| | |_|/ | |/| | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1252337
* | | | Merge pull request #488 from kwoodson/zbxapiKenny Woodson2015-08-179-24/+761
|\ \ \ \ | | | | | | | | | | Zabbix API updates
| * | | | UpdatesKenny Woodson2015-08-179-24/+761
| | | | |
* | | | | Merge pull request #444 from aveshagarwal/ae-ansible-merge-uninstallBrenton Leanhardt2015-08-171-0/+93
|\ \ \ \ \ | | | | | | | | | | | | AE->OSO ansible uninstall merge
| * | | | | Updated to include origin and atomic-openshift RPMs re-factoring toAvesh Agarwal2015-08-171-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include all origin, AE and openshift products. For back-word compatibility, older openshift and AE naming is retained too.
| * | | | | Updated tutorial reset file and made following chages:Avesh Agarwal2015-08-171-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Included openshift clean up 2. Renamed file to atomic_openshift_tutorial_reset.yml 3. docker service is not not stopped 4. docker containers and images are removed 5. /etc/openshift-sdn are removed too now
| * | | | | Renamed the file as it mainly applies to atomic enterprise.Avesh Agarwal2015-08-171-0/+0
| | | | | |
| * | | | | Added /root/.kube to be deleted so that the stuff there does not preventAvesh Agarwal2015-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | a new install.
| * | | | | playbooks/adhoc: Add a tutorial-reset playbook to undo everythingColin Walters2015-08-171-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to run through the tutorial, as well as reset a VM or baremetal node to a clean slate for developer testing.