summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1844 from openshift/README-updatesJason DeTiberus2016-04-291-8/+5
|\
| * README UpdatesJason DeTiberus2016-04-291-8/+5
|/
* Merge pull request #1842 from talset/inventory_certJason DeTiberus2016-04-293-3/+3
|\
| * Fix inventory syntaxetalset2016-04-293-3/+3
|/
* Merge pull request #1840 from detiber/logging_fixJason DeTiberus2016-04-291-16/+24
|\
| * additional fixesJason DeTiberus2016-04-281-15/+22
| * Fix templating issue with logging roleJason DeTiberus2016-04-281-1/+2
* | Merge pull request #1835 from sdodson/bz1331346Jason DeTiberus2016-04-281-4/+7
|\ \ | |/ |/|
| * BuildDefaults are a kube admission controller not an openshift admissionScott Dodson2016-04-281-4/+7
* | Merge pull request #1836 from smunilla/BZ1331365Jason DeTiberus2016-04-282-9/+16
|\ \
| * | a-o-i: More friendly proxy questionsSamuel Munilla2016-04-282-9/+16
|/ /
* | Merge pull request #1831 from sdodson/update-repos-on-upgradeJason DeTiberus2016-04-281-1/+2
|\ \
| * | Update repos per inventory before upgradingScott Dodson2016-04-271-1/+2
* | | Merge pull request #1834 from jianlinliu/masterJason DeTiberus2016-04-283-3/+3
|\ \ \ | |_|/ |/| |
| * | update tenand_id typo in example fileJianlin Liu2016-04-281-1/+1
| * | Update hosts.ose.exampleJianlin Liu2016-04-281-1/+1
| * | update tenand_id typo in example fileJianlin Liu2016-04-281-1/+1
|/ /
* | Merge pull request #1818 from dgoodwin/safe-yaml-3Jason DeTiberus2016-04-271-1/+6
|\ \ | |/ |/|
| * Fix inventory properties with raw booleans, again...Devan Goodwin2016-04-271-1/+6
* | Automatic commit of package [openshift-ansible] release [3.0.87-1].Troy Dawson2016-04-272-2/+10
* | Merge pull request #1830 from smunilla/BZ1330918Jason DeTiberus2016-04-272-1/+11
|\ \
| * | a-o-i: Populate groups for openshift_factsSamuel Munilla2016-04-272-1/+11
| |/
* | Merge pull request #1829 from smunilla/BZ1330919Jason DeTiberus2016-04-271-3/+7
|\ \
| * | a-o-i-: Allow empty proxySamuel Munilla2016-04-271-3/+7
| |/
* | Merge pull request #1812 from sdodson/issue1759Jason DeTiberus2016-04-276-1/+12
|\ \
| * | Add masterConfig.volumeConfig.dynamicProvisioningEnabledScott Dodson2016-04-266-1/+12
* | | Merge pull request #1824 from abutcher/sudo-becomeJason DeTiberus2016-04-2727-37/+37
|\ \ \ | |_|/ |/| |
| * | Replace sudo with become when accessing deployment_vars.Andrew Butcher2016-04-2727-37/+37
|/ /
* | Merge pull request #1813 from abutcher/v2-lookupJason DeTiberus2016-04-263-217/+26
|\ \
| * | Port lookup plugins to ansible v2.Andrew Butcher2016-04-263-217/+26
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.86-1].Brenton Leanhardt2016-04-262-2/+15
* | Merge pull request #1808 from sdodson/fix-proxyAndrew Butcher2016-04-264-16/+16
|\ \
| * | Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY valuesScott Dodson2016-04-264-16/+16
|/ /
* | Merge pull request #1809 from abutcher/portal-netJason DeTiberus2016-04-267-6/+6
|\ \ | |/ |/|
| * Move portal_net from openshift_common to openshift_facts.Andrew Butcher2016-04-263-5/+1
| * Apply openshift_common to all masters prior to creating certificates for port...Andrew Butcher2016-04-261-0/+4
| * Access portal_net in common facts.Andrew Butcher2016-04-265-5/+5
* | Merge pull request #1810 from smunilla/fix_nosetests_26_aprJason DeTiberus2016-04-261-0/+2
|\ \
| * | a-o-i tests: Update attended tests for proxySamuel Munilla2016-04-261-0/+2
|/ /
* | Merge pull request #1765 from smunilla/proxy_uiJason DeTiberus2016-04-263-1/+29
|\ \
| * | a-o-i: Update prompt when asking for proxySamuel Munilla2016-04-191-0/+11
| * | a-o-i: UI additions for proxiesSamuel Munilla2016-04-183-1/+18
* | | Merge pull request #1726 from detiber/htpasswd_usersJason DeTiberus2016-04-267-4/+103
|\ \ \ | |_|/ |/| |
| * | Add support for setting identity provider custom valuesJason DeTiberus2016-04-257-4/+103
* | | Merge pull request #1799 from ibotty/port_filter_plugins_to_ansible_2Jason DeTiberus2016-04-252-5/+10
|\ \ \
| * | | port filter_plugins to ansible2Tobias Florek2016-04-252-5/+10
* | | | Automatic commit of package [openshift-ansible] release [3.0.85-1].Troy Dawson2016-04-252-2/+19
* | | | Merge pull request #1777 from brenton/evacJason DeTiberus2016-04-254-13/+30
|\ \ \ \
| * \ \ \ Merge branch 'master' into evacBrenton Leanhardt2016-04-2519-20/+299
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Pod must be recreated for the upgradeBrenton Leanhardt2016-04-254-13/+30