Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1818 from dgoodwin/safe-yaml-3 | Jason DeTiberus | 2016-04-27 | 1 | -1/+6 |
|\ | | | | | Fix inventory properties with raw booleans, again... | ||||
| * | Fix inventory properties with raw booleans, again... | Devan Goodwin | 2016-04-27 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | The fix earlier in this affected method was only being applied when merging old and new facts. In a first run on a clean system with no pre-existing openshift facts cache, the yaml safe load was not applied resulting in the same broken master config. (which would fix itself if you just reran the config playbook) Apply the same check on new facts not previously applied on the system. | ||||
* | | Automatic commit of package [openshift-ansible] release [3.0.87-1]. | Troy Dawson | 2016-04-27 | 2 | -2/+10 |
| | | |||||
* | | Merge pull request #1830 from smunilla/BZ1330918 | Jason DeTiberus | 2016-04-27 | 2 | -1/+11 |
|\ \ | | | | | | | a-o-i: Populate groups for openshift_facts | ||||
| * | | a-o-i: Populate groups for openshift_facts | Samuel Munilla | 2016-04-27 | 2 | -1/+11 |
| |/ | | | | | | | | | openshift_facts is currently failing because it doesn't properly set up groups after the proxy changes we made. This fixes that. | ||||
* | | Merge pull request #1829 from smunilla/BZ1330919 | Jason DeTiberus | 2016-04-27 | 1 | -3/+7 |
|\ \ | | | | | | | a-o-i-: Allow empty proxy | ||||
| * | | a-o-i-: Allow empty proxy | Samuel Munilla | 2016-04-27 | 1 | -3/+7 |
| |/ | |||||
* | | Merge pull request #1812 from sdodson/issue1759 | Jason DeTiberus | 2016-04-27 | 6 | -1/+12 |
|\ \ | | | | | | | Add masterConfig.volumeConfig.dynamicProvisioningEnabled | ||||
| * | | Add masterConfig.volumeConfig.dynamicProvisioningEnabled | Scott Dodson | 2016-04-26 | 6 | -1/+12 |
| | | | |||||
* | | | Merge pull request #1824 from abutcher/sudo-become | Jason DeTiberus | 2016-04-27 | 27 | -37/+37 |
|\ \ \ | |_|/ |/| | | Replace sudo with become when accessing deployment_vars. | ||||
| * | | Replace sudo with become when accessing deployment_vars. | Andrew Butcher | 2016-04-27 | 27 | -37/+37 |
|/ / | |||||
* | | Merge pull request #1813 from abutcher/v2-lookup | Jason DeTiberus | 2016-04-26 | 3 | -217/+26 |
|\ \ | | | | | | | Port lookup_plugins to ansible v2. | ||||
| * | | Port lookup plugins to ansible v2. | Andrew Butcher | 2016-04-26 | 3 | -217/+26 |
|/ / | |||||
* | | Automatic commit of package [openshift-ansible] release [3.0.86-1]. | Brenton Leanhardt | 2016-04-26 | 2 | -2/+15 |
| | | |||||
* | | Merge pull request #1808 from sdodson/fix-proxy | Andrew Butcher | 2016-04-26 | 4 | -16/+16 |
|\ \ | | | | | | | Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY values | ||||
| * | | Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY values | Scott Dodson | 2016-04-26 | 4 | -16/+16 |
|/ / | |||||
* | | Merge pull request #1809 from abutcher/portal-net | Jason DeTiberus | 2016-04-26 | 7 | -6/+6 |
|\ \ | |/ |/| | BZ 1330357: Fail to deploy pod after installing env with openshift_master_portal_net='172.31.0.0/16' | ||||
| * | Move portal_net from openshift_common to openshift_facts. | Andrew Butcher | 2016-04-26 | 3 | -5/+1 |
| | | |||||
| * | Apply openshift_common to all masters prior to creating certificates for ↵ | Andrew Butcher | 2016-04-26 | 1 | -0/+4 |
| | | | | | | | | portal_net. | ||||
| * | Access portal_net in common facts. | Andrew Butcher | 2016-04-26 | 5 | -5/+5 |
| | | |||||
* | | Merge pull request #1810 from smunilla/fix_nosetests_26_apr | Jason DeTiberus | 2016-04-26 | 1 | -0/+2 |
|\ \ | | | | | | | a-o-i tests: Update attended tests for proxy | ||||
| * | | a-o-i tests: Update attended tests for proxy | Samuel Munilla | 2016-04-26 | 1 | -0/+2 |
|/ / | | | | | | | Update the input to account for the new questions around proxies. | ||||
* | | Merge pull request #1765 from smunilla/proxy_ui | Jason DeTiberus | 2016-04-26 | 3 | -1/+29 |
|\ \ | | | | | | | a-o-i: UI additions for proxies | ||||
| * | | a-o-i: Update prompt when asking for proxy | Samuel Munilla | 2016-04-19 | 1 | -0/+11 |
| | | | |||||
| * | | a-o-i: UI additions for proxies | Samuel Munilla | 2016-04-18 | 3 | -1/+18 |
| | | | |||||
* | | | Merge pull request #1726 from detiber/htpasswd_users | Jason DeTiberus | 2016-04-26 | 7 | -4/+103 |
|\ \ \ | |_|/ |/| | | Add support for setting identity provider custom values | ||||
| * | | Add support for setting identity provider custom values | Jason DeTiberus | 2016-04-25 | 7 | -4/+103 |
| | | | | | | | | | | | | | | | | | | | | | - htpasswd users - ldap ca file - openid ca file - request_header ca file | ||||
* | | | Merge pull request #1799 from ibotty/port_filter_plugins_to_ansible_2 | Jason DeTiberus | 2016-04-25 | 2 | -5/+10 |
|\ \ \ | | | | | | | | | port filter_plugins to ansible2 | ||||
| * | | | port filter_plugins to ansible2 | Tobias Florek | 2016-04-25 | 2 | -5/+10 |
| | | | | |||||
* | | | | Automatic commit of package [openshift-ansible] release [3.0.85-1]. | Troy Dawson | 2016-04-25 | 2 | -2/+19 |
| | | | | |||||
* | | | | Merge pull request #1777 from brenton/evac | Jason DeTiberus | 2016-04-25 | 4 | -13/+30 |
|\ \ \ \ | | | | | | | | | | | Pod evacuation | ||||
| * \ \ \ | Merge branch 'master' into evac | Brenton Leanhardt | 2016-04-25 | 19 | -20/+299 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Pod must be recreated for the upgrade | Brenton Leanhardt | 2016-04-25 | 4 | -13/+30 |
| | | | | | |||||
* | | | | | Merge pull request #1793 from detiber/default_subdomain | Jason DeTiberus | 2016-04-25 | 2 | -4/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix backward compat for osm_default_subdomain | ||||
| * | | | | | Fix backward compat for osm_default_subdomain | Jason DeTiberus | 2016-04-25 | 2 | -4/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1803 from sdodson/issue1800 | Jason DeTiberus | 2016-04-25 | 2 | -4/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix image version handling for v1.2.0-rc1 | ||||
| * | | | | | Merge branch 'master' into issue1800 | Scott Dodson | 2016-04-25 | 25 | -92/+370 |
| |\| | | | | |||||
| * | | | | | Fix image version handling for v1.2.0-rc1 | Scott Dodson | 2016-04-25 | 2 | -4/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1804 from abutcher/v2-sudo | Jason DeTiberus | 2016-04-25 | 51 | -104/+104 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Replace deprecated sudo with become. | ||||
| * | | | | Replace deprecated sudo with become. | Andrew Butcher | 2016-04-25 | 51 | -104/+104 |
| | | | | | |||||
* | | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | 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:` |