| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into evac | Brenton Leanhardt | 2016-04-25 | 19 | -20/+299 |
| |\ | |||||
| | * | 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 | ||||
| | | * | 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 | 15 | -16/+283 |
| | |\ \ | | | | | | | | | Global Proxy Config | ||||
| | | * | | Sort and de-dupe no_proxy list | Scott Dodson | 2016-04-25 | 1 | -0/+18 |
| | | | | | |||||
| | | * | | Add global proxy configuration | Scott Dodson | 2016-04-22 | 15 | -16/+265 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configures HTTP_PROXY, HTTPS_PROXY, NO_PROXY for master and docker services. Configugres BuildDefaults Admission controller for master to automatically insert proxy environment configuration into build environments. To use set at least these variables - openshift_http_proxy - openshift_https_proxy NO_PROXY entries will automatically be configured for hostnames of all openshift hosts. You may specify additional NO_PROXY hosts or patterns by setting `openshift_no_proxy` If you wish to disable automatic generation of NO_PROXY hosts you may set `openshift_generate_no_proxy_hosts` to False. If you wish to have different builddefaults proxy configuration than baseline proxy configuration set these variables - openshift_builddefaults_http_proxy - openshift_builddefaults_https_proxy - openshift_builddefaults_no_proxy - openshift_builddefaults_git_http_proxy - openshift_builddefaults_git_https_proxy | ||||
| | * | | | Merge pull request #1786 from enoodle/additional_features_metrics | Jason DeTiberus | 2016-04-25 | 4 | -3/+15 |
| | |\ \ \ | | |_|/ | |/| | | openshift-metrics: adding duration and resolution options | ||||
| | | * | | openshift-metrics: adding duration and resolution options | Erez Freiberger | 2016-04-24 | 4 | -3/+15 |
| | | | | | |||||
| * | | | | Pod must be recreated for the upgrade | Brenton Leanhardt | 2016-04-25 | 4 | -13/+30 |
| |/ / / | |||||
| * | | | Merge pull request #1796 from donovanmuller/master | Jason DeTiberus | 2016-04-25 | 4 | -4/+4 |
| |\ \ \ | | | | | | | | | Rename openshift_node_dnsmasq to openshift_use_dnsmasq where applicable | ||||
| | * | | | As per ↵ | Donovan Muller | 2016-04-24 | 4 | -4/+4 |
| | |/ / | | | | | | | | | | https://github.com/openshift/openshift-ansible/issues/1795#issuecomment-213873564, renamed openshift_node_dnsmasq to openshift_use_dnsmasq where applicable. Fixes 1795 | ||||
| * | | | Merge pull request #1798 from ibotty/remove_duplicate_register | Jason DeTiberus | 2016-04-25 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | remove duplicate `register:` | ||||
| | * | | | remove duplicate register: | Tobias Florek | 2016-04-06 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge pull request #1782 from vishpat/serviceaccount_review | Jason DeTiberus | 2016-04-25 | 4 | -67/+67 |
| |\ \ \ \ | |_|/ / |/| | | | Changed service account creation to ansible | ||||
| | * | | | Changed service account creation to ansible | Vishal Patil | 2016-04-24 | 4 | -67/+67 |
| |/ / / | |||||
| * | / | Automatic commit of package [openshift-ansible] release [3.0.84-1]. | Troy Dawson | 2016-04-22 | 2 | -2/+8 |
| | |/ |/| | |||||
| * | | Merge pull request #1792 from detiber/fix_docker_version_check | Jason DeTiberus | 2016-04-22 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix for docker not present | ||||
| | * | | Fix for docker not present | Jason DeTiberus | 2016-04-22 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #1791 from liggitt/reconcile-role-additive | Jason DeTiberus | 2016-04-22 | 4 | -5/+5 |
| |\ \ | | | | | | | Reconcile roles in additive-only mode on upgrade | ||||
| | * | | Reconcile roles in additive-only mode on upgrade | Jordan Liggitt | 2016-04-22 | 4 | -5/+5 |
| |/ / | |||||
| * | | Merge pull request #1785 from abutcher/master-etcd-vars | Brenton Leanhardt | 2016-04-21 | 1 | -0/+2 |
| |\ \ | | | | | | | Set etcd_hostname and etcd_ip for masters w/ external etcd. | ||||
| | * | | Set etcd_hostname and etcd_ip for masters w/ external etcd. | Andrew Butcher | 2016-04-21 | 1 | -0/+2 |
| | | | | |||||
| * | | | Automatic commit of package [openshift-ansible] release [3.0.83-1]. | Troy Dawson | 2016-04-21 | 2 | -2/+12 |
| | | | | |||||
| * | | | Merge pull request #1787 from smunilla/BZ1329165 | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | a-o-i: Correct bug with default storage host | ||||
| | * | | | a-o-i: Correct bug with default storage host | Samuel Munilla | 2016-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Fix issue with assigning the Host object to a variable that expects a string. | ||||
| * | | | | Merge pull request #1783 from dgoodwin/portal-net | Brenton Leanhardt | 2016-04-21 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | Fix bug after portal_net move from master to common role. | ||||
| | * | | | Fix bug after portal_net move from master to common role. | Devan Goodwin | 2016-04-21 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | | | | | | | Use of the variable was still pointing to the master role location causing the default insecure registry subnet to be used rather than the expected one. | ||||
| * | | | Merge pull request #1784 from brenton/reconcile1 | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Only add new sccs | ||||
| | * | | Only add new sccs | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1756 from abhat/configurable_admin_user_pass | Brenton Leanhardt | 2016-04-20 | 3 | -1/+10 |
| |\ \ \ | |/ / |/| | | Configurable admin username and passsword for Openshift enterprise in Nuage. | ||||
| | * | | Support configurable admin user and password for the enterprise | Aniket Bhat | 2016-04-18 | 3 | -1/+10 |
| | | | | | | | | | | | | | Prefix changes for admin and password with nuage_master | ||||
| * | | | Merge pull request #1776 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-20 | 10 | -170/+339 |
| |\ \ \ | | | | | | | | | Image stream sync | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Automatic commit of package [openshift-ansible] release [3.0.82-1]. | Troy Dawson | 2016-04-20 | 2 | -2/+25 |
| | | | | | |||||
| * | | | | 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. | ||||
| | * | | | | Fix use of JSON inventory vars with raw booleans. | Devan Goodwin | 2016-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thought this was fixed in recent patch but somehow backed out a critical change to the isinstance, we need to check for basestring to also have this work with unicode strings. | ||||
| * | | | | | Merge pull request #1754 from abutcher/etcd-cert-fixes | Brenton Leanhardt | 2016-04-20 | 17 | -77/+92 |
| |\ \ \ \ \ | | | | | | | | | | | | | Bug 1299065: Fix etcd hostname/ip address handling | ||||
| | * | | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the ↵ | Andrew Butcher | 2016-04-20 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | etcd role. | ||||
| | * | | | | | Use openshift_hostname/openshift_ip values for etcd configuration and ↵ | Andrew Butcher | 2016-04-20 | 16 | -75/+92 |
| | | |/ / / | |/| | | | | | | | | | | | | | certificates. | ||||
| * | | | | | Merge pull request #1742 from dgoodwin/docker-logging | Brenton Leanhardt | 2016-04-20 | 6 | -6/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixes For Docker Log Options | ||||
| | * | | | | | Use a JSON list for docker log options. | Devan Goodwin | 2016-04-20 | 5 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we expected you to comma separate, but this wasn't really clear. Insted we will use an explicit JSON list going forward. The comma separated list will be supported for backwards compatability. | ||||
| | * | | | | | Fix legacy cli_docker_* vars not migrating. | Devan Goodwin | 2016-04-20 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | No hosts were matching this renamed host group, so the oo_lookup module was not being triggered to migrate these to their new openshift_docker prefix. | ||||
| * | | | | | Merge pull request #1781 from dgoodwin/image-tag-ver-2 | Brenton Leanhardt | 2016-04-20 | 3 | -4/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix use of older image tag version during upgrade. | ||||
| | * | | | | | Fix use of older image tag version during upgrade. | Devan Goodwin | 2016-04-20 | 3 | -4/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If doing an upgrade with a 3.2.0.x version that was older than the latest, the upgrade would actually use the latest in the systemd unit files and thus the actual containers that get used. (despite pulling down the correct version first) | ||||
| * | | | | | Merge pull request #1766 from abutcher/router-selector | Brenton Leanhardt | 2016-04-20 | 8 | -17/+51 |
| |\ \ \ \ \ | | | | | | | | | | | | | Bug 1328119 - router selector not obeyed | ||||
| | * | | | | | Translate legacy facts within the oo_openshift_env filter. | Andrew Butcher | 2016-04-20 | 2 | -7/+8 |
| | | | | | | | |||||
| | * | | | | | Remove empty facts from nested dictionaries. | Andrew Butcher | 2016-04-20 | 1 | -8/+18 |
| | | | | | | | |||||
| | * | | | | | Fix router selector fact migration and match multiple selectors when ↵ | Andrew Butcher | 2016-04-20 | 9 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | counting nodes. | ||||
| * | | | | | | Merge pull request #1582 from jdnieto/openshift_metrics | Brenton Leanhardt | 2016-04-20 | 9 | -1/+162 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | added new openshift-metrics service | ||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. | Suren A. Chilingaryan |
| summaryrefslogtreecommitdiffstats |