summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
| | | | | | |
| * | | | | | Remove empty facts from nested dictionaries.Andrew Butcher2016-04-201-8/+18
| | | | | | |
| * | | | | | Fix router selector fact migration and match multiple selectors when ↵Andrew Butcher2016-04-204-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | counting nodes.
* | | | | | | Merge pull request #1582 from jdnieto/openshift_metricsBrenton Leanhardt2016-04-206-0/+152
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | added new openshift-metrics service
| * | | | | | added new openshift-metrics serviceJose David Martin Nieto2016-04-206-0/+152
| |/ / / / /
* | | | | | Add openshift_node_dnsmasqScott Dodson2016-04-1915-18/+173
| | | | | |
* | | | | | Promote portal_net to openshift.common, add kube_svc_ipScott Dodson2016-04-196-8/+28
|/ / / / / | | | | | | | | | | | | | | | | | | | | Conflicts: roles/openshift_facts/library/openshift_facts.py
* | | | | Merge pull request #1734 from joelddiaz/tools-roles-moveJoel Diaz2016-04-19134-13659/+0
|\ \ \ \ \ | | | | | | | | | | | | cleanup roles after roles move to openshift-tools
| * | | | | cleanup roles after roles move to openshift-toolsJoel Diaz2016-04-15134-13659/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also removing inventory/multi_inventory* things left behind unchanged even though they were copied: playbooks/adhoc/* roles/dns roles/kube_nfs_volumes roles/os_update_latest
* | | | | | Merge pull request #1763 from sdodson/image-stream-syncBrenton Leanhardt2016-04-181-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use 'openshift3/' as IMAGE_PREFIX for enterprise logging and metrics
| * | | | | IMAGE_PREFIX=openshift3/ for enterprise logging/metricsScott Dodson2016-04-181-1/+1
| | |/ / / | |/| | |
* / | | | Bug 1320829 - Handle OSE 3.0 installsBrenton Leanhardt2016-04-181-1/+1
|/ / / /
* | | | Merge pull request #1746 from brenton/docker1Brenton Leanhardt2016-04-159-36/+45
|\ \ \ \ | | | | | | | | | | The openshift_docker role must set the version facts for containerize…
| * | | | Support mixed RPM/container installsBrenton Leanhardt2016-04-142-6/+6
| | | | |
| * | | | The openshift_docker role must set the version facts for containerized installsBrenton Leanhardt2016-04-148-34/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.
* | | | | Refactor docker failed state cleanupScott Dodson2016-04-151-14/+8
| | | | |
* | | | | start it, check for failure, reset it, start againScott Dodson2016-04-141-8/+11
| | | | |
* | | | | Enable docker before potentially resetting the failureScott Dodson2016-04-141-1/+10
|/ / / /
* | | | Merge pull request #1738 from dgoodwin/image-policy-configBrenton Leanhardt2016-04-133-5/+15
|\ \ \ \ | | | | | | | | | | Support setting imagePolicyConfig JSON in inventory.
| * | | | Support setting imagePolicyConfig JSON in inventory.Devan Goodwin2016-04-123-5/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For flexibility this is another pure JSON field to translate directly to yaml in the master config. Also updated to more safely handle JSON inventory variables as this uncovered a bug with booleans where you end up with a string containing json in your yaml.
* | | | Merge pull request #1744 from smunilla/BZ1323918Brenton Leanhardt2016-04-121-1/+1
|\ \ \ \ | | | | | | | | | | Convert image_tag on masters
| * | | | Convert image_tag on mastersSamuel Munilla2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | Also convert openshift_image_tag to and rpm versions for masters.
* | | | | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 ↵Brenton Leanhardt2016-04-121-8/+11
| | | | | | | | | | | | | | | | | | | | containerized env