summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Remove duplicate oauth_template fact.Andrew Butcher2016-04-291-1/+0
|
* Cleanup various deprecation warnings.Andrew Butcher2016-04-2912-48/+44
|
* Merge pull request #1840 from detiber/logging_fixJason DeTiberus2016-04-291-16/+24
|\ | | | | Fix templating issue with logging role
| * additional fixesJason DeTiberus2016-04-281-15/+22
| |
| * Fix templating issue with logging roleJason DeTiberus2016-04-281-1/+2
| |
* | BuildDefaults are a kube admission controller not an openshift admissionScott Dodson2016-04-281-4/+7
|/ | | | | | controller Also, improve commenting
* Merge pull request #1818 from dgoodwin/safe-yaml-3Jason DeTiberus2016-04-271-1/+6
|\ | | | | Fix inventory properties with raw booleans, again...
| * Fix inventory properties with raw booleans, again...Devan Goodwin2016-04-271-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.
* | Merge pull request #1812 from sdodson/issue1759Jason DeTiberus2016-04-273-1/+5
|\ \ | |/ |/| Add masterConfig.volumeConfig.dynamicProvisioningEnabled
| * Add masterConfig.volumeConfig.dynamicProvisioningEnabledScott Dodson2016-04-263-1/+5
| |
* | 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-265-4/+4
|\ \ | |/ |/| 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-262-1/+1
| |
| * Access portal_net in common facts.Andrew Butcher2016-04-263-3/+3
| |
* | Merge pull request #1726 from detiber/htpasswd_usersJason DeTiberus2016-04-263-3/+39
|\ \ | |/ |/| Add support for setting identity provider custom values
| * Add support for setting identity provider custom valuesJason DeTiberus2016-04-253-3/+39
| | | | | | | | | | | | | | - htpasswd users - ldap ca file - openid ca file - request_header ca file
* | Merge pull request #1777 from brenton/evacJason DeTiberus2016-04-251-1/+1
|\ \ | | | | | | Pod evacuation
| * | 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_subdomain
| * | | Fix backward compat for osm_default_subdomainJason DeTiberus2016-04-251-1/+1
| | |/ | |/|
* | | Merge pull request #1803 from sdodson/issue1800Jason DeTiberus2016-04-251-2/+3
|\ \ \ | | | | | | | | Fix image version handling for v1.2.0-rc1
| * | | 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.
| * | | 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_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-2512-16/+205
|\ \ \ | | | | | | | | Global Proxy Config
| * | | Sort and de-dupe no_proxy listScott Dodson2016-04-251-0/+18
| | | |
| * | | Add global proxy configurationScott Dodson2016-04-2212-16/+187
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-3/+9
|\ \ \ | |_|/ |/| | openshift-metrics: adding duration and resolution options
| * | 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:`
| * | 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
|\ \ | | | | | | Configurable admin username and passsword for Openshift enterprise in Nuage.
| * | Support configurable admin user and password for the enterpriseAniket Bhat2016-04-183-1/+10
| | | | | | | | | | | | Prefix changes for admin and password with nuage_master
* | | Merge pull request #1776 from sdodson/image-stream-syncBrenton Leanhardt2016-04-2010-170/+339
|\ \ \ | | | | | | | | Image stream sync
| * | | 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.
| * | | | Fix use of JSON inventory vars with raw booleans.Devan Goodwin2016-04-151-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-fixesBrenton Leanhardt2016-04-2014-72/+83
|\ \ \ \ \ | | | | | | | | | | | | Bug 1299065: Fix etcd hostname/ip address handling
| * | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the ↵Andrew Butcher2016-04-202-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | etcd role.
| * | | | | Use openshift_hostname/openshift_ip values for etcd configuration and ↵Andrew Butcher2016-04-2013-70/+83
| | |/ / / | |/| | | | | | | | | | | | | certificates.
* | | | | Use a JSON list for docker log options.Devan Goodwin2016-04-201-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #1766 from abutcher/router-selectorBrenton Leanhardt2016-04-203-9/+20
|\ \ \ \ \ | | | | | | | | | | | | Bug 1328119 - router selector not obeyed
| * | | | | Translate legacy facts within the oo_openshift_env filter.Andrew Butcher2016-04-201-6/+0
| | | | | |