summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace map with oo_collect to support python-jinja2 <2.7Andrew Butcher2015-11-203-7/+7
|
* Merge pull request #937 from rdossin1A/machine_typesThomas Wiest2015-11-194-2/+17
|\ | | | | Differentiate machine types on GCE (master and nodes)
| * 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
|\ \ | | | | | | Docker on master aws
| * \ Merge pull request #1 from detiber/dockerOnMasterAWSChengcheng Mu2015-11-193-6/+5
| |\ \ | | | | | | | | small tweaks for adding docker volume for aws master hosts
| | * | 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
|\ \ \ | |_|/ |/| | Refactor named certficates
| * | 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 node
| * | | 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 override
| * | | | 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_user
| * | | | | 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 monitoring
| * | | | Created role to deploy ops host monitoringJoel Diaz2015-11-189-0/+243
| | | | | | | | | | | | | | | | | | | | oso_host_monitoring to config/run host monitoring container(s)
* | | | | Merge pull request #927 from abutcher/formatFieldsThomas Wiest2015-11-181-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Use field numbers for each format in bin/cluster for python 2.6
| * | | | | 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).
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Adding httptest to zabbix library
| * | | | | | First attempt at adding web scenariosKenny Woodson2015-11-171-0/+282
| | | | | | |
* | | | | | | Merge pull request #926 from brenton/aep3Brenton Leanhardt2015-11-173-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | The aep3 images changed locations.
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the case where the first host entered is not a master.
| * | | | | | | atomic-openshift-installer: Temporarily restrict to single masterSamuel Munilla2015-11-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we should restrict the quick installer to a single master. This should change in the near future.
* | | | | | | | Merge pull request #903 from detiber/gluster_fixBrenton Leanhardt2015-11-171-2/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Bug 1282336 - Add additional seboolean for gluster
| * | | | | | | Bug 1282336 - Add additional seboolean for glusterJason DeTiberus2015-11-161-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added setting seboolean for virt_sandbox_use_fusefs - Added a failed_when to not fail if virt_sandbox_use_fusefs does not exist
* | | | | | | | Merge pull request #925 from smunilla/single_masterBrenton Leanhardt2015-11-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | atomic-openshift-installer: Correct single master case
| * | | | | | | | atomic-openshift-installer: Correct single master caseSamuel Munilla2015-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the case where the first host entered is not a master.
* | | | | | | | | Merge pull request #921 from twiest/prThomas Wiest2015-11-177-12/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | added copr-openshift-ansible releaser, removed old rel-eng stuff.
| * | | | | | | | | 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 -> count in maser items
| * | | | | | | | changed counter -> countMatt Woodson2015-11-171-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #919 from kwoodson/datatypeKenny Woodson2015-11-173-0/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Adding data_type to zbx_items
| * | | | | | | | 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 type
| * | | | | | updated my check to support the boolean data typeMatt Woodson2015-11-171-1/+2
| | | | | | |
* | | | | | | Merge pull request #910 from mwoodson/master_checksMatt Woodson2015-11-171-1/+24
|\| | | | | | | |_|_|_|/ / |/| | | | | added healthz check and more pod count checks
| * | | | | added healthz check and more pod count checksMatt Woodson2015-11-161-1/+24
| | | | | |
* | | | | | Merge pull request #907 from smunilla/single_masterBrenton Leanhardt2015-11-161-4/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / atomic-openshift-installer: Temporarily restrict to single master
| * / / / atomic-openshift-installer: Temporarily restrict to single masterSamuel Munilla2015-11-161-4/+6
|/ / / / | | | | | | | | | | | | | | | | For now, we should restrict the quick installer to a single master. This should change in the near future.
* | | | Merge pull request #906 from smunilla/match_versionBrenton Leanhardt2015-11-161-3/+3
|\ \ \ \ | | | | | | | | | | openshift-ansible: Correct variable
| * | | | openshift-ansible: Correct variableSamuel Munilla2015-11-161-3/+3
| | | | |
* | | | | Merge pull request #905 from smunilla/match_versionBrenton Leanhardt2015-11-161-16/+16
|\| | | | | | | | | | | | | | atomic-openshift-utils: Version lock playbooks
| * | | | atomic-openshift-utils: Version lock playbooksSamuel Munilla2015-11-161-16/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | Requires the openshift-ansible-playbooks and openshift-ansible-roles to match atomic-openshift-utils or be newer. Revise some of the other Requires to be more logical.