summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add masterConfig.volumeConfig.dynamicProvisioningEnabledScott Dodson2016-04-266-1/+12
* 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
* | | | | Merge pull request #1793 from detiber/default_subdomainJason DeTiberus2016-04-252-4/+3
|\ \ \ \ \
| * | | | | Fix backward compat for osm_default_subdomainJason DeTiberus2016-04-252-4/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #1803 from sdodson/issue1800Jason DeTiberus2016-04-252-4/+8
|\ \ \ \ \
| * | | | | Merge branch 'master' into issue1800Scott Dodson2016-04-2525-92/+370
| |\| | | |
| * | | | | Fix image version handling for v1.2.0-rc1Scott Dodson2016-04-252-4/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #1804 from abutcher/v2-sudoJason DeTiberus2016-04-2551-104/+104
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace deprecated sudo with become.Andrew Butcher2016-04-2551-104/+104
* | | | | Merge pull request #1802 from detiber/etcd_fact_depsJason DeTiberus2016-04-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | openshift_etcd_facts should rely on openshift_facts not openshift_commonJason DeTiberus2016-04-251-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1385 from sdodson/global-proxyJason DeTiberus2016-04-2515-16/+283
|\ \ \ \
| * | | | Sort and de-dupe no_proxy listScott Dodson2016-04-251-0/+18
| * | | | Add global proxy configurationScott Dodson2016-04-2215-16/+265
* | | | | Merge pull request #1786 from enoodle/additional_features_metricsJason DeTiberus2016-04-254-3/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | openshift-metrics: adding duration and resolution optionsErez Freiberger2016-04-244-3/+15
| | |/ / | |/| |
* | | | Merge pull request #1796 from donovanmuller/masterJason DeTiberus2016-04-254-4/+4
|\ \ \ \
| * | | | As per https://github.com/openshift/openshift-ansible/issues/1795#issuecommen...Donovan Muller2016-04-244-4/+4
| |/ / /
* | | | Merge pull request #1798 from ibotty/remove_duplicate_registerJason DeTiberus2016-04-251-1/+0
|\ \ \ \
| * | | | remove duplicate register:Tobias Florek2016-04-061-1/+0
* | | | | Merge pull request #1782 from vishpat/serviceaccount_reviewJason DeTiberus2016-04-254-67/+67
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Changed service account creation to ansibleVishal Patil2016-04-244-67/+67
|/ / / /
* | / / Automatic commit of package [openshift-ansible] release [3.0.84-1].Troy Dawson2016-04-222-2/+8
| |/ / |/| |
* | | Merge pull request #1792 from detiber/fix_docker_version_checkJason DeTiberus2016-04-221-1/+1
|\ \ \
| * | | Fix for docker not presentJason DeTiberus2016-04-221-1/+1
|/ / /
* | | Merge pull request #1791 from liggitt/reconcile-role-additiveJason DeTiberus2016-04-224-5/+5
|\ \ \
| * | | Reconcile roles in additive-only mode on upgradeJordan Liggitt2016-04-224-5/+5
|/ / /
* | | Merge pull request #1785 from abutcher/master-etcd-varsBrenton Leanhardt2016-04-211-0/+2
|\ \ \
| * | | Set etcd_hostname and etcd_ip for masters w/ external etcd.Andrew Butcher2016-04-211-0/+2
* | | | Automatic commit of package [openshift-ansible] release [3.0.83-1].Troy Dawson2016-04-212-2/+12
* | | | Merge pull request #1787 from smunilla/BZ1329165Brenton Leanhardt2016-04-211-1/+1
|\ \ \ \
| * | | | a-o-i: Correct bug with default storage hostSamuel Munilla2016-04-211-1/+1
* | | | | Merge pull request #1783 from dgoodwin/portal-netBrenton Leanhardt2016-04-211-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bug after portal_net move from master to common role.Devan Goodwin2016-04-211-2/+2
| |/ / /
* | | | Merge pull request #1784 from brenton/reconcile1Brenton Leanhardt2016-04-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Only add new sccsBrenton Leanhardt2016-04-211-1/+1
* | | | Merge pull request #1756 from abhat/configurable_admin_user_passBrenton Leanhardt2016-04-203-1/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Support configurable admin user and password for the enterpriseAniket Bhat2016-04-183-1/+10