summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add serviceAccountConfig.masterCA during 3.1 upgradeJason DeTiberus2015-11-231-0/+4
| | | | | - uses the value of oauthConfig.masterCA if present, otherwise sets it to ca.crt
* Automatic commit of package [openshift-ansible] release [3.0.15-1].Kenny Woodson2015-11-202-2/+20
|
* Merge pull request #950 from kwoodson/clonegroupfixKenny Woodson2015-11-201-15/+19
|\ | | | | Fixing clone groups in multi_inventory
| * Fixing clone group functionality. Also separating extra_vars from extra_groupsKenny Woodson2015-11-201-15/+19
| |
* | Merge pull request #890 from smunilla/friendly_unattended_errorsBrenton Leanhardt2015-11-203-1/+78
|\ \ | |/ |/| atomic-openshift-installer: connect_to error handling
| * Check the end result on bad config fileSamuel Munilla2015-11-201-3/+3
| |
| * Add some tests for a bad configSamuel Munilla2015-11-202-0/+72
| |
| * atomic-openshift-installer: connect_to error handlingSamuel Munilla2015-11-201-1/+6
| | | | | | | | Catch the exception that happens when connect_to isn't specified in installer.cfg.yaml
* | Merge pull request #914 from smunilla/pylint_fixesBrenton Leanhardt2015-11-201-5/+7
|\ \ | |/ |/| atomic-openshift-installer: pylint fixes
| * atomic-openshift-installer: pylint fixesSamuel Munilla2015-11-201-5/+7
|/ | | | A few fixes to keep pylint happy.
* Merge pull request #929 from sdodson/fix-30-imagestreamsBrenton Leanhardt2015-11-20114-6/+22520
|\ | | | | Install version dependent image streams for v1.0 and v1.1
| * Install version dependent image streams for v1.0 and v1.1Scott Dodson2015-11-18114-6/+22520
| |
* | Merge pull request #938 from brenton/uninstallBrenton Leanhardt2015-11-201-5/+5
|\ \ | | | | | | Making the uninstall playbook more flexible
| * | Making the uninstall playbook more flexibleBrenton Leanhardt2015-11-191-5/+5
| | | | | | | | | | | | | | | This handles stage environments as well as the eventual change of aep3_beta to aep3
* | | Merge pull request #924 from detiber/noSetHostnameBrenton Leanhardt2015-11-201-3/+0
|\ \ \ | | | | | | | | Do not update the hostname
| * | | Do not update the hostnameJason DeTiberus2015-11-171-3/+0
| | | |
* | | | Merge pull request #945 from abutcher/OoCollectBrenton Leanhardt2015-11-203-7/+7
|\ \ \ \ | | | | | | | | | | Replace map with oo_collect for python-jinja2 <2.7
| * | | | Replace map with oo_collect to support python-jinja2 <2.7Andrew Butcher2015-11-203-7/+7
| | | | |
* | | | | Merge pull request #902 from dgoodwin/rpm-test-fixBrenton Leanhardt2015-11-203-8/+17
|\ \ \ \ \ | | | | | | | | | | | | Default to OSE 3.1 in interactive installer instead of 3.0.
| * | | | | 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 quantile items to zabbix
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added the ability to add users to usergroups through the zbx_usergroups module.
| * | | | | 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)
| * | | | | | 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