Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' into evac | Brenton Leanhardt | 2016-04-25 | 15 | -20/+215 | |
| |\| | | ||||||
| * | | | Pod must be recreated for the upgrade | Brenton Leanhardt | 2016-04-25 | 1 | -1/+1 | |
* | | | | Merge pull request #1793 from detiber/default_subdomain | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix backward compat for osm_default_subdomain | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1803 from sdodson/issue1800 | Jason DeTiberus | 2016-04-25 | 1 | -2/+3 | |
|\ \ \ \ | ||||||
| * | | | | Merge branch 'master' into issue1800 | Scott Dodson | 2016-04-25 | 20 | -88/+282 | |
| |\| | | | ||||||
| * | | | | Fix image version handling for v1.2.0-rc1 | Scott Dodson | 2016-04-25 | 1 | -2/+3 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #1804 from abutcher/v2-sudo | Jason DeTiberus | 2016-04-25 | 10 | -31/+31 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Replace deprecated sudo with become. | Andrew Butcher | 2016-04-25 | 10 | -31/+31 | |
* | | | | Merge pull request #1802 from detiber/etcd_fact_deps | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | openshift_etcd_facts should rely on openshift_facts not openshift_common | Jason DeTiberus | 2016-04-25 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1385 from sdodson/global-proxy | Jason DeTiberus | 2016-04-25 | 12 | -16/+205 | |
|\ \ \ | ||||||
| * | | | Sort and de-dupe no_proxy list | Scott Dodson | 2016-04-25 | 1 | -0/+18 | |
| * | | | Add global proxy configuration | Scott Dodson | 2016-04-22 | 12 | -16/+187 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1786 from enoodle/additional_features_metrics | Jason DeTiberus | 2016-04-25 | 3 | -3/+9 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | openshift-metrics: adding duration and resolution options | Erez Freiberger | 2016-04-24 | 3 | -3/+9 | |
| |/ | ||||||
* | | Merge pull request #1798 from ibotty/remove_duplicate_register | Jason DeTiberus | 2016-04-25 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | remove duplicate register: | Tobias Florek | 2016-04-06 | 1 | -1/+0 | |
* | | | Changed service account creation to ansible | Vishal Patil | 2016-04-24 | 4 | -67/+67 | |
| |/ |/| | ||||||
* | | Fix for docker not present | Jason DeTiberus | 2016-04-22 | 1 | -1/+1 | |
* | | Merge pull request #1756 from abhat/configurable_admin_user_pass | Brenton Leanhardt | 2016-04-20 | 3 | -1/+10 | |
|\ \ | ||||||
| * | | Support configurable admin user and password for the enterprise | Aniket Bhat | 2016-04-18 | 3 | -1/+10 | |
* | | | Merge pull request #1776 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-20 | 10 | -170/+339 | |
|\ \ \ | ||||||
| * | | | Sync latest content | Scott Dodson | 2016-04-19 | 9 | -168/+337 | |
| * | | | Use xpaas 1.3.0-1, use enterprise content for metrics | Scott Dodson | 2016-04-19 | 1 | -2/+2 | |
* | | | | Merge pull request #1758 from dgoodwin/fix-json-vars | Brenton Leanhardt | 2016-04-20 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix use of JSON inventory vars with raw booleans. | Devan Goodwin | 2016-04-15 | 1 | -1/+1 | |
* | | | | | Merge pull request #1754 from abutcher/etcd-cert-fixes | Brenton Leanhardt | 2016-04-20 | 14 | -72/+83 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the e... | Andrew Butcher | 2016-04-20 | 2 | -2/+0 | |
| * | | | | | Use openshift_hostname/openshift_ip values for etcd configuration and certifi... | Andrew Butcher | 2016-04-20 | 13 | -70/+83 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Use a JSON list for docker log options. | Devan Goodwin | 2016-04-20 | 1 | -1/+12 | |
* | | | | | Merge pull request #1766 from abutcher/router-selector | Brenton Leanhardt | 2016-04-20 | 3 | -9/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | Translate legacy facts within the oo_openshift_env filter. | Andrew Butcher | 2016-04-20 | 1 | -6/+0 | |
| * | | | | | Remove empty facts from nested dictionaries. | Andrew Butcher | 2016-04-20 | 1 | -8/+18 | |
| * | | | | | Fix router selector fact migration and match multiple selectors when counting... | Andrew Butcher | 2016-04-20 | 4 | -1/+8 | |
* | | | | | | Merge pull request #1582 from jdnieto/openshift_metrics | Brenton Leanhardt | 2016-04-20 | 6 | -0/+152 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | added new openshift-metrics service | Jose David Martin Nieto | 2016-04-20 | 6 | -0/+152 | |
| |/ / / / | ||||||
* | | | | | Add openshift_node_dnsmasq | Scott Dodson | 2016-04-19 | 15 | -18/+173 | |
* | | | | | Promote portal_net to openshift.common, add kube_svc_ip | Scott Dodson | 2016-04-19 | 6 | -8/+28 | |
|/ / / / | ||||||
* | | | | Merge pull request #1734 from joelddiaz/tools-roles-move | Joel Diaz | 2016-04-19 | 134 | -13659/+0 | |
|\ \ \ \ | ||||||
| * | | | | cleanup roles after roles move to openshift-tools | Joel Diaz | 2016-04-15 | 134 | -13659/+0 | |
* | | | | | Merge pull request #1763 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | IMAGE_PREFIX=openshift3/ for enterprise logging/metrics | Scott Dodson | 2016-04-18 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* / | | | Bug 1320829 - Handle OSE 3.0 installs | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #1746 from brenton/docker1 | Brenton Leanhardt | 2016-04-15 | 9 | -36/+45 | |
|\ \ \ | ||||||
| * | | | Support mixed RPM/container installs | Brenton Leanhardt | 2016-04-14 | 2 | -6/+6 | |
| * | | | The openshift_docker role must set the version facts for containerized installs | Brenton Leanhardt | 2016-04-14 | 8 | -34/+43 | |
* | | | | Refactor docker failed state cleanup | Scott Dodson | 2016-04-15 | 1 | -14/+8 | |
* | | | | start it, check for failure, reset it, start again | Scott Dodson | 2016-04-14 | 1 | -8/+11 | |
* | | | | Enable docker before potentially resetting the failure | Scott Dodson | 2016-04-14 | 1 | -1/+10 | |
|/ / / |