summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '6659d1e4fa14f5100458608337468e513374a385' into quick_haSamuel Munilla2015-11-230-0/+0
|\
| * Handling preconfigured load balancersBrenton Leanhardt2015-11-233-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preconfigured load balancers, previously denoted by having 'run_on' set to false, cannot have their facts gathered which results in a stack trace. Later when we write out the inventory we have to fake out the hostname and just use 'connect_to'. We're likely going to have the concept of other types of "plug-in" hosts where we don't run ansible. We should make sure we abstract this properly so it's easy to add additional types of hosts. Also in the commit: - Renamed 'run_on' to 'preconfigured' and inverted the logic as needed - Output tally of Masters and Nodes as well as remaining Masters required for HA - Minor rewording in a few places - Currently only prompting for the load balancer after all other hosts have been entered - Removed spurious echo
| * Merge branch 'quick_ha' of https://github.com/smunilla/openshift-ansible ↵Brenton Leanhardt2015-11-234-31/+269
| |\ | | | | | | | | | into quick_ha
| | * atomic-openshift-installer: Rename ha_proxySamuel Munilla2015-11-204-15/+15
| | | | | | | | | | | | | | | Rename ha_proxy variables and methods to 'master_lb' to better future-proof things.
| | * atomic-openshift-installer: Reverse version and host collectionSamuel Munilla2015-11-202-11/+13
| | | | | | | | | | | | | | | | | | Reverse the order we ask two questions: What variant the user wants to install and which hosts to install on. This lets us avoid asking for multiple masters for 3.0 installs.
| | * cli_installer_tests: Add test for unattended quick HASamuel Munilla2015-11-201-0/+101
| | |
| | * Breakup inventory writingSamuel Munilla2015-11-201-16/+24
| | |
| | * Enforce 1 or 3 mastersSamuel Munilla2015-11-201-2/+8
| | |
| | * Add interactive testSamuel Munilla2015-11-201-0/+27
| | |
| | * atomic-openshift-installer: HA for quick installerSamuel Munilla2015-11-204-17/+111
| | | | | | | | | | | | This adds the ability to quickly set up a multi-master environment.
* | | Handling preconfigured load balancersBrenton Leanhardt2015-11-233-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preconfigured load balancers, previously denoted by having 'run_on' set to false, cannot have their facts gathered which results in a stack trace. Later when we write out the inventory we have to fake out the hostname and just use 'connect_to'. We're likely going to have the concept of other types of "plug-in" hosts where we don't run ansible. We should make sure we abstract this properly so it's easy to add additional types of hosts. Also in the commit: - Renamed 'run_on' to 'preconfigured' and inverted the logic as needed - Output tally of Masters and Nodes as well as remaining Masters required for HA - Minor rewording in a few places - Currently only prompting for the load balancer after all other hosts have been entered - Removed spurious echo
* | | atomic-openshift-installer: Rename ha_proxySamuel Munilla2015-11-234-15/+15
| | | | | | | | | | | | | | | Rename ha_proxy variables and methods to 'master_lb' to better future-proof things.
* | | atomic-openshift-installer: Reverse version and host collectionSamuel Munilla2015-11-232-11/+13
| | | | | | | | | | | | | | | | | | Reverse the order we ask two questions: What variant the user wants to install and which hosts to install on. This lets us avoid asking for multiple masters for 3.0 installs.
* | | cli_installer_tests: Add test for unattended quick HASamuel Munilla2015-11-231-0/+101
| | |
* | | Breakup inventory writingSamuel Munilla2015-11-231-16/+24
| | |
* | | Enforce 1 or 3 mastersSamuel Munilla2015-11-231-2/+8
| | |
* | | Add interactive testSamuel Munilla2015-11-231-0/+27
| | |
* | | atomic-openshift-installer: HA for quick installerSamuel Munilla2015-11-234-17/+111
| | | | | | | | | | | | This adds the ability to quickly set up a multi-master environment.
* | | Merge pull request #909 from detiber/mappingMethodBrenton Leanhardt2015-11-234-99/+498
|\ \ \ | | | | | | | | Add mappingMethod to identityProviders config
| * | | Use the identity_providers from openshift_facts instead of always using the ↵Jason DeTiberus2015-11-231-1/+1
| | | | | | | | | | | | | | | | inventory variable
| * | | Refactor master identity provider configurationJason DeTiberus2015-11-234-99/+498
| |/ / | | | | | | | | | | | | | | | - Remote template in favor of a filter plugin - Add additional validation for identity provider config - Add mappingMethod attribute for identity providers, default to 'claim'
* | | Merge pull request #960 from kwoodson/httptestfixKenny Woodson2015-11-231-1/+9
|\ \ \ | | | | | | | | Fixing the step parameters with a "no" when not passed with that key
| * | | Modified step params to be in order when passed as a listKenny Woodson2015-11-231-1/+9
| |/ /
* | | Merge pull request #957 from detiber/upgradeFixBrenton Leanhardt2015-11-231-0/+4
|\ \ \ | |/ / |/| | Add serviceAccountConfig.masterCA during 3.1 upgrade
| * | 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.