summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1829 from smunilla/BZ1330919Jason DeTiberus2016-04-271-3/+7
|\ | | | | a-o-i-: Allow empty proxy
| * a-o-i-: Allow empty proxySamuel Munilla2016-04-271-3/+7
| |
* | Merge pull request #1812 from sdodson/issue1759Jason DeTiberus2016-04-276-1/+12
|\ \ | | | | | | Add masterConfig.volumeConfig.dynamicProvisioningEnabled
| * | Add masterConfig.volumeConfig.dynamicProvisioningEnabledScott Dodson2016-04-266-1/+12
| | |
* | | Merge pull request #1824 from abutcher/sudo-becomeJason DeTiberus2016-04-2727-37/+37
|\ \ \ | |_|/ |/| | Replace sudo with become when accessing deployment_vars.
| * | Replace sudo with become when accessing deployment_vars.Andrew Butcher2016-04-2727-37/+37
|/ /
* | Merge pull request #1813 from abutcher/v2-lookupJason DeTiberus2016-04-263-217/+26
|\ \ | | | | | | Port lookup_plugins to ansible v2.
| * | Port lookup plugins to ansible v2.Andrew Butcher2016-04-263-217/+26
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.86-1].Brenton Leanhardt2016-04-262-2/+15
| |
* | Merge pull request #1808 from sdodson/fix-proxyAndrew Butcher2016-04-264-16/+16
|\ \ | | | | | | Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY values
| * | Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY valuesScott Dodson2016-04-264-16/+16
|/ /
* | Merge pull request #1809 from abutcher/portal-netJason DeTiberus2016-04-267-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 Butcher2016-04-263-5/+1
| |
| * Apply openshift_common to all masters prior to creating certificates for ↵Andrew Butcher2016-04-261-0/+4
| | | | | | | | portal_net.
| * Access portal_net in common facts.Andrew Butcher2016-04-265-5/+5
| |
* | Merge pull request #1810 from smunilla/fix_nosetests_26_aprJason DeTiberus2016-04-261-0/+2
|\ \ | | | | | | a-o-i tests: Update attended tests for proxy
| * | a-o-i tests: Update attended tests for proxySamuel Munilla2016-04-261-0/+2
|/ / | | | | | | Update the input to account for the new questions around proxies.
* | Merge pull request #1765 from smunilla/proxy_uiJason DeTiberus2016-04-263-1/+29
|\ \ | | | | | | a-o-i: UI additions for proxies
| * | 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 values
| * | Add support for setting identity provider custom valuesJason DeTiberus2016-04-257-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_2Jason DeTiberus2016-04-252-5/+10
|\ \ \ | | | | | | | | port filter_plugins to ansible2
| * | | 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
|\ \ \ \ | | | | | | | | | | Pod evacuation
| * \ \ \ 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_subdomain
| * | | | | Fix backward compat for osm_default_subdomainJason DeTiberus2016-04-252-4/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #1803 from sdodson/issue1800Jason DeTiberus2016-04-252-4/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix image version handling for v1.2.0-rc1
| * | | | | 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.
| * | | | 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_common
| * | | | 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
|\ \ \ \ | | | | | | | | | | Global Proxy Config
| * | | | Sort and de-dupe no_proxy listScott Dodson2016-04-251-0/+18
| | | | |
| * | | | Add global proxy configurationScott Dodson2016-04-2215-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_metricsJason DeTiberus2016-04-254-3/+15
|\ \ \ \ \ | |_|/ / / |/| | | | openshift-metrics: adding duration and resolution options
| * | | | openshift-metrics: adding duration and resolution optionsErez Freiberger2016-04-244-3/+15
| | |/ / | |/| |
* | | | Merge pull request #1796 from donovanmuller/masterJason DeTiberus2016-04-254-4/+4
|\ \ \ \ | | | | | | | | | | Rename openshift_node_dnsmasq to openshift_use_dnsmasq where applicable
| * | | | As per ↵Donovan Muller2016-04-244-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_registerJason DeTiberus2016-04-251-1/+0
|\ \ \ \ | | | | | | | | | | remove duplicate `register:`
| * | | | 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 ansible
| * | | | 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 present