summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Fix for docker not presentJason DeTiberus2016-04-221-1/+1
|/ /
* | Merge pull request #1791 from liggitt/reconcile-role-additiveJason DeTiberus2016-04-224-5/+5
|\ \ | | | | | | Reconcile roles in additive-only mode on upgrade
| * | Reconcile roles in additive-only mode on upgradeJordan Liggitt2016-04-224-5/+5
|/ /
* | Merge pull request #1785 from abutcher/master-etcd-varsBrenton Leanhardt2016-04-211-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 Butcher2016-04-211-0/+2
| | |
* | | Automatic commit of package [openshift-ansible] release [3.0.83-1].Troy Dawson2016-04-212-2/+12
| | |
* | | Merge pull request #1787 from smunilla/BZ1329165Brenton Leanhardt2016-04-211-1/+1
|\ \ \ | | | | | | | | a-o-i: Correct bug with default storage host
| * | | a-o-i: Correct bug with default storage hostSamuel Munilla2016-04-211-1/+1
| | | | | | | | | | | | | | | | Fix issue with assigning the Host object to a variable that expects a string.
* | | | Merge pull request #1783 from dgoodwin/portal-netBrenton Leanhardt2016-04-211-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 Goodwin2016-04-211-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/reconcile1Brenton Leanhardt2016-04-211-1/+1
|\ \ \ | |/ / |/| | Only add new sccs
| * | Only add new sccsBrenton Leanhardt2016-04-211-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
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.82-1].Troy Dawson2016-04-202-2/+25
| | | |
* | | | 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-2017-77/+92
|\ \ \ \ \ | | | | | | | | | | | | 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-2016-75/+92
| | |/ / / | |/| | | | | | | | | | | | | certificates.
* | | | | Merge pull request #1742 from dgoodwin/docker-loggingBrenton Leanhardt2016-04-206-6/+20
|\ \ \ \ \ | | | | | | | | | | | | Fixes For Docker Log Options
| * | | | | Use a JSON list for docker log options.Devan Goodwin2016-04-205-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 Goodwin2016-04-201-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-2Brenton Leanhardt2016-04-203-4/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix use of older image tag version during upgrade.
| * | | | | Fix use of older image tag version during upgrade.Devan Goodwin2016-04-203-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-selectorBrenton Leanhardt2016-04-208-17/+51
|\ \ \ \ \ | | | | | | | | | | | | Bug 1328119 - router selector not obeyed
| * | | | | Translate legacy facts within the oo_openshift_env filter.Andrew Butcher2016-04-202-7/+8
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:58:11 +0000