summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1777 from brenton/evacJason DeTiberus2016-04-251-1/+1
|\
| * Merge branch 'master' into evacBrenton Leanhardt2016-04-2515-20/+215
| |\
| * | Pod must be recreated for the upgradeBrenton Leanhardt2016-04-251-1/+1
* | | Merge pull request #1793 from detiber/default_subdomainJason DeTiberus2016-04-251-1/+1
|\ \ \
| * | | Fix backward compat for osm_default_subdomainJason DeTiberus2016-04-251-1/+1
| | |/ | |/|
* | | Merge pull request #1803 from sdodson/issue1800Jason DeTiberus2016-04-251-2/+3
|\ \ \
| * | | Merge branch 'master' into issue1800Scott Dodson2016-04-2520-88/+282
| |\| |
| * | | Fix image version handling for v1.2.0-rc1Scott Dodson2016-04-251-2/+3
* | | | Merge pull request #1804 from abutcher/v2-sudoJason DeTiberus2016-04-2510-31/+31
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace deprecated sudo with become.Andrew Butcher2016-04-2510-31/+31
* | | | 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-2512-16/+205
|\ \ \
| * | | Sort and de-dupe no_proxy listScott Dodson2016-04-251-0/+18
| * | | Add global proxy configurationScott Dodson2016-04-2212-16/+187
| | |/ | |/|
* | | Merge pull request #1786 from enoodle/additional_features_metricsJason DeTiberus2016-04-253-3/+9
|\ \ \ | |_|/ |/| |
| * | openshift-metrics: adding duration and resolution optionsErez Freiberger2016-04-243-3/+9
| |/
* | Merge pull request #1798 from ibotty/remove_duplicate_registerJason DeTiberus2016-04-251-1/+0
|\ \
| * | remove duplicate register:Tobias Florek2016-04-061-1/+0
* | | Changed service account creation to ansibleVishal Patil2016-04-244-67/+67
| |/ |/|
* | Fix for docker not presentJason DeTiberus2016-04-221-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
* | | Merge pull request #1776 from sdodson/image-stream-syncBrenton Leanhardt2016-04-2010-170/+339
|\ \ \
| * | | Sync latest contentScott Dodson2016-04-199-168/+337
| * | | Use xpaas 1.3.0-1, use enterprise content for metricsScott Dodson2016-04-191-2/+2
* | | | Merge pull request #1758 from dgoodwin/fix-json-varsBrenton Leanhardt2016-04-201-1/+1
|\ \ \ \
| * | | | Fix use of JSON inventory vars with raw booleans.Devan Goodwin2016-04-151-1/+1
* | | | | Merge pull request #1754 from abutcher/etcd-cert-fixesBrenton Leanhardt2016-04-2014-72/+83
|\ \ \ \ \
| * | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the e...Andrew Butcher2016-04-202-2/+0
| * | | | | Use openshift_hostname/openshift_ip values for etcd configuration and certifi...Andrew Butcher2016-04-2013-70/+83
| | |/ / / | |/| | |
* | | | | Use a JSON list for docker log options.Devan Goodwin2016-04-201-1/+12
* | | | | Merge pull request #1766 from abutcher/router-selectorBrenton Leanhardt2016-04-203-9/+20
|\ \ \ \ \
| * | | | | Translate legacy facts within the oo_openshift_env filter.Andrew Butcher2016-04-201-6/+0
| * | | | | Remove empty facts from nested dictionaries.Andrew Butcher2016-04-201-8/+18
| * | | | | Fix router selector fact migration and match multiple selectors when counting...Andrew Butcher2016-04-204-1/+8
* | | | | | Merge pull request #1582 from jdnieto/openshift_metricsBrenton Leanhardt2016-04-206-0/+152
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added new openshift-metrics serviceJose David Martin Nieto2016-04-206-0/+152
| |/ / / /
* | | | | Add openshift_node_dnsmasqScott Dodson2016-04-1915-18/+173
* | | | | Promote portal_net to openshift.common, add kube_svc_ipScott Dodson2016-04-196-8/+28
|/ / / /
* | | | Merge pull request #1734 from joelddiaz/tools-roles-moveJoel Diaz2016-04-19134-13659/+0
|\ \ \ \
| * | | | cleanup roles after roles move to openshift-toolsJoel Diaz2016-04-15134-13659/+0
* | | | | Merge pull request #1763 from sdodson/image-stream-syncBrenton Leanhardt2016-04-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | IMAGE_PREFIX=openshift3/ for enterprise logging/metricsScott Dodson2016-04-181-1/+1
| | |/ / | |/| |
* / | | Bug 1320829 - Handle OSE 3.0 installsBrenton Leanhardt2016-04-181-1/+1
|/ / /
* | | Merge pull request #1746 from brenton/docker1Brenton Leanhardt2016-04-159-36/+45
|\ \ \
| * | | Support mixed RPM/container installsBrenton Leanhardt2016-04-142-6/+6
| * | | The openshift_docker role must set the version facts for containerized installsBrenton Leanhardt2016-04-148-34/+43
* | | | Refactor docker failed state cleanupScott Dodson2016-04-151-14/+8
* | | | start it, check for failure, reset it, start againScott Dodson2016-04-141-8/+11