summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Fixing non-HA master restart conditionalBrenton Leanhardt2016-04-121-1/+1
| | |
* | | use RestartSec to avoid default rate limit in systemdBrenton Leanhardt2016-04-128-0/+8
| | | | | | | | | | | | Lifted from https://github.com/openshift/origin/pull/8317
* | | Containerized installs on RHEL were downgrading docker unnecessarilyBrenton Leanhardt2016-04-124-15/+34
|/ /
* | Merge pull request #1705 from abutcher/secure-routerBrenton Leanhardt2016-04-1210-78/+170
|\ \ | | | | | | Add support for creating secure router
| * | Add support for creating secure router.Andrew Butcher2016-04-1110-78/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move openshift_router to openshift_hosted role which will eventually contain registry, metrics and logging. * Adds option for specifying an openshift_hosted_router_certificate cert and key pair. * Removes dependency on node label variables and retrieves the node list from the API s.t. this role can be applied to any cluster with existing nodes. I've added an openshift_hosted playbook that occurs after node install to account for this. * Infrastructure nodes are selected using openshift_hosted_router_selector which is based on deployment type by default; openshift-enterprise -> "region=infra" and online -> "type=infra".
* | | Fix a docker-storage sysconfig bug.Devan Goodwin2016-04-111-4/+3
|/ /
* | Merge openshift_env hostvars.Andrew Butcher2016-04-082-10/+6
| |
* | Add openshift_hosted_facts role and remove hosted facts from openshift_common.Andrew Butcher2016-04-087-11/+33
|/
* Merge pull request #1728 from brenton/bz1324729Brenton Leanhardt2016-04-082-8/+8
|\ | | | | Bug 1324729 - Import xPaas image streams failed during 3.2 installation
| * Bug 1324729 - Import xPaas image streams failed during 3.2 installationBrenton Leanhardt2016-04-072-8/+8
| |
* | Merge pull request #1720 from abutcher/fix-docker-installBrenton Leanhardt2016-04-071-2/+2
|\ \ | |/ |/| Test docker_version_result.stdout when determining if docker should be installed/downgraded.
| * Test docker_version_result.stdout when determining if docker should be ↵Andrew Butcher2016-04-061-2/+2
| | | | | | | | installed/downgraded.
* | Merge pull request #1719 from kwoodson/oadmrouterKenny Woodson2016-04-0711-82/+1375
|\ \ | | | | | | oadm_router first attempt.
| * | First attempt at oadm router moduleKenny Woodson2016-04-0711-82/+1375
| | |
* | | Merge pull request #1724 from abutcher/nfs-no-commonBrenton Leanhardt2016-04-072-8/+7
|\ \ \ | | | | | | | | Bug 1324371: needn't install atomic-openshift packages on nfs server
| * | | Remove openshift_common dep from openshift_storage_nfsAndrew Butcher2016-04-062-8/+7
| | | |
* | | | Merge pull request #1722 from abutcher/containerized-cloudproviderBrenton Leanhardt2016-04-074-4/+4
|\ \ \ \ | | | | | | | | | | Add cloudprovider config dir to docker options.
| * | | | Add cloudprovider config dir to docker options.Andrew Butcher2016-04-064-4/+4
| | |_|/ | |/| |
* | | | Merge pull request #1699 from abutcher/check-cloudprovider-kindBrenton Leanhardt2016-04-065-22/+25
|\ \ \ \ | | | | | | | | | | Check for kind in cloudprovider facts prior to accessing.
| * | | | Check for kind in cloudprovider facts prior to accessing.Andrew Butcher2016-04-045-22/+25
| | | | |
* | | | | Merge pull request #1660 from dgoodwin/admission-configBrenton Leanhardt2016-04-063-4/+56
|\ \ \ \ \ | |_|_|/ / |/| | | | Add support for templating master admissionConfig.
| * | | | Add support for configuring oauth templates.Devan Goodwin2016-04-013-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users who wish to deploy configs with ansible to define templates for oauth screens, and control the alwaysShowProviderSelection setting. There are currently three supported oauth templates, and we have a pre-existing 'oauth_template' variable, but it is assumed to mean you are controlling the 'login' screen, and this is the only one you can configure. To work around this, supporting all current and future templates, introduce a pluralized variable 'oauth_templates', which contains a JSON dict allowing the admin to control any template they wish. If both new and old variables are defined, the old one is ignored. (and can be considered deprecated) Internally the old value will be converted to the new dict, so the template just references one value. Example: openshift_master_oauth_always_show_provider_selection=true openshift_master_oauth_templates={"providerSelection": "provider-selection.html", "error": "oauth-error.html"} Yeilds: oauthConfig: alwaysShowProviderSelection: true templates: error: oauth-error.html providerSelection: provider-selection.html
| * | | | Add support for templating master admissionConfig.Devan Goodwin2016-04-013-1/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds four new inventory variables for setting sections in "admissionConfig" and "kubernetesMasterConfig.admissionConfig". openshift_master_admission_plugin_order allows configuring the list of origin admission controller plugins to enable and what order to run them in. This must be a JSON formatted list of strings: openshift_master_admission_plugin_order=["RunOnceDuration", "NamespaceLifecycle", "OriginPodNodeEnvironment", "ClusterResourceOverride", "LimitRanger", "ServiceAccount", "SecurityContextConstraint", "ResourceQuota", "SCCExecRestrictions"] openshift_master_kube_admission_plugin_order is identical but for the kubernetes admission controller plugins which appear beneath kubernetesMasterConfig. openshift_master_admission_plugin_config allows setting free-form configuration stanzas that match up with enabled admission controller plugins. This must be a JSON formatted hash: openshift_master_admission_plugin_config={"RunOnceDuration":{"configuration":{"apiVersion":"v1","kind":"RunOnceDurationConfig","activeDeadlineSecondsOverride":3600}},"ClusterResourceOverride":{"configuration":{"apiVersion":"v1","kind":"ClusterResourceOverrideConfig","limitCPUToMemoryPercent":200,"cpuRequestToLimitPercent":6,"memoryRequestToLimitPercent":60}}} openshift_master_kube_admission_plugin_config is the equivalent for kubernetes admission controller plugins. Contains a change to merge_facts to fix issues with modifying inventory variables that contain JSON dicts. If you modified a previously set variable, the result would be a merge of old and new, which is completely wrong in this case. Addded new overwrite_facts to shortcut to just taking the new values. This differs from the pre-existing concept of "protected" in that we're not protecting an old value, we're trashing it and taking the new.
* | | | Merge pull request #1721 from kwoodson/userrefreshKenny Woodson2016-04-061-0/+2
|\ \ \ \ | | | | | | | | | | Adding refresh for zbx_user.
| * | | | Update for zbx_user refreshKenny Woodson2016-04-061-0/+2
| | | | |
* | | | | Docker 1.9 is actually cool starting in origin 1.1.4Scott Dodson2016-04-061-1/+1
| |_|/ / |/| | |