summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #902 from dgoodwin/rpm-test-fixBrenton Leanhardt2015-11-203-8/+17
|\
| * Pylint fix for long line in cli docstring.Devan Goodwin2015-11-161-1/+2
| * Default to installing OSE 3.1 instead of 3.0.Devan Goodwin2015-11-162-3/+4
| * Fix tests on systems with openshift-ansible rpms installed.Devan Goodwin2015-11-162-4/+11
* | Automatic commit of package [openshift-ansible] release [3.0.14-1].Brenton Leanhardt2015-11-192-2/+67
* | Merge pull request #939 from mwoodson/master_checksMatt Woodson2015-11-191-0/+82
|\ \
| * | added metric items to zabbix for openshift onlineMatt Woodson2015-11-191-0/+82
* | | Merge pull request #940 from kwoodson/usergrpfixKenny Woodson2015-11-191-22/+42
|\ \ \ | |/ / |/| |
| * | Updating usergroups to accept usersKenny Woodson2015-11-191-22/+42
* | | Merge pull request #937 from rdossin1A/machine_typesThomas Wiest2015-11-194-2/+17
|\ \ \
| * | | Differentiate machine types on GCE (master and nodes)Romain Dossin2015-11-194-2/+17
* | | | Merge pull request #933 from menren/dockerOnMasterAWSThomas Wiest2015-11-193-7/+14
|\ \ \ \
| * \ \ \ Merge pull request #1 from detiber/dockerOnMasterAWSChengcheng Mu2015-11-193-6/+5
| |\ \ \ \
| | * | | | small tweaks for adding docker volume for aws master hostsJason DeTiberus2015-11-183-6/+5
| |/ / / /
| * | | | add a volume on master host, in AWS provisioningChengcheng Mu2015-11-183-3/+11
* | | | | Merge pull request #881 from abutcher/namedCertRefactorBrenton Leanhardt2015-11-195-35/+108
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update certificate paths when 'names' key is provided.Andrew Butcher2015-11-181-0/+1
| * | | | Add additive_facts_to_overwrite instead of overwriting all additive_factsAndrew Butcher2015-11-162-18/+31
| * | | | Refactor named certificates.Andrew Butcher2015-11-165-35/+94
* | | | | Merge pull request #936 from detiber/uninstallUpdateBrenton Leanhardt2015-11-181-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Uninstall - Remove systemd wants file for nodeJason DeTiberus2015-11-181-0/+1
* | | | | Merge pull request #918 from detiber/fix_ec2_instance_type_overrideThomas Wiest2015-11-182-9/+16
|\ \ \ \ \
| * | | | | Fix ec2 instance type overrideJason DeTiberus2015-11-172-9/+16
* | | | | | Merge pull request #934 from detiber/requirettyThomas Wiest2015-11-181-0/+7
|\ \ \ \ \ \
| * | | | | | ec2 - force !requiretty for ssh_userJason DeTiberus2015-11-181-0/+7
| |/ / / / /
* | | | | | Merge pull request #928 from joelddiaz/monitoring-deployJoel Diaz2015-11-189-0/+243
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Created role to deploy ops host monitoringJoel Diaz2015-11-189-0/+243
* | | | | | Merge pull request #927 from abutcher/formatFieldsThomas Wiest2015-11-181-10/+10
|\ \ \ \ \ \
| * | | | | | Use field numbers for all formats in bin/cluster for python 2.6Andrew Butcher2015-11-171-10/+10
* | | | | | | Merge pull request #862 from twiest/update_ec2pyThomas Wiest2015-11-182-62/+680
|\ \ \ \ \ \ \
| * | | | | | | updating to the latest ec2.py (and re-patching with our changes).Thomas Wiest2015-11-162-62/+680
* | | | | | | | Merge pull request #931 from kwoodson/httptestKenny Woodson2015-11-181-0/+282
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | First attempt at adding web scenariosKenny Woodson2015-11-171-0/+282
* | | | | | | | Merge pull request #926 from brenton/aep3Brenton Leanhardt2015-11-173-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Automatic commit of package [openshift-ansible] release [3.0.13-1].Brenton Leanhardt2015-11-172-2/+8
| * | | | | | | | The aep3 images changed locations.Brenton Leanhardt2015-11-171-1/+1
| * | | | | | | | atomic-openshift-installer: Correct single master caseSamuel Munilla2015-11-171-1/+1
| * | | | | | | | atomic-openshift-installer: Temporarily restrict to single masterSamuel Munilla2015-11-171-4/+6
* | | | | | | | | Merge pull request #903 from detiber/gluster_fixBrenton Leanhardt2015-11-171-2/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Bug 1282336 - Add additional seboolean for glusterJason DeTiberus2015-11-161-2/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #925 from smunilla/single_masterBrenton Leanhardt2015-11-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | atomic-openshift-installer: Correct single master caseSamuel Munilla2015-11-171-1/+1
* | | | | | | | | Merge pull request #921 from twiest/prThomas Wiest2015-11-177-12/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added copr-openshift-ansible releaser, removed old rel-eng stuff.Thomas Wiest2015-11-177-12/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #920 from mwoodson/master_checksMatt Woodson2015-11-171-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | changed counter -> countMatt Woodson2015-11-171-2/+2
* | | | | | | | | Merge pull request #919 from kwoodson/datatypeKenny Woodson2015-11-173-0/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Updating zbx_item classes to support data types for bool.Kenny Woodson2015-11-173-0/+42
|/ / / / / / / /
* | | | | | / / Merge pull request #917 from mwoodson/master_checksKenny Woodson2015-11-171-1/+2
|\| | | | | | | | |_|_|_|_|/ / |/| | | | | |
| * | | | | | updated my check to support the boolean data typeMatt Woodson2015-11-171-1/+2