summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |_|/ / |/| | |
* | | | Merge pull request #1695 from brenton/bz1323123Brenton Leanhardt2016-04-067-3/+4
|\ \ \ \ | | | | | | | | | | Fixing bugs 1322788 and 1323123
| * | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api ↵Brenton Leanhardt2016-04-017-3/+4
| | | | | | | | | | | | | | | | | | | | and atomic-openshift-master-controllers
| * | | | Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ↵Brenton Leanhardt2016-04-011-1/+1
| | |/ / | |/| | | | | | | | | | ose3.2 repo
* | | | Merge pull request #1698 from sdodson/xpaas13Brenton Leanhardt2016-04-06100-4502/+9996
|\ \ \ \ | | | | | | | | | | XPAAS v1.3 content
| * | | | XPAAS v1.3 for OSE 3.2Scott Dodson2016-04-0453-5218/+1805
| | | | |
| * | | | XPAAS 1.3 content for OSE 3.1Scott Dodson2016-04-0448-37/+8944
| |/ / /
* | | | when docker is installed, make it 1.8.2 to avoid issuesMatt Woodson2016-04-051-1/+1
| | | |
* | | | Merge pull request #1700 from brenton/32haBrenton Leanhardt2016-04-051-0/+4
|\ \ \ \ | |_|/ / |/| | | Pacemaker is unsupported for 3.2
| * | | Pacemaker is unsupported for 3.2Brenton Leanhardt2016-04-041-0/+4
| | |/ | |/|
* / | Downgrade to docker 1.8.2 if installing OSE < 3.2Scott Dodson2016-04-059-25/+43
|/ /
* | Fixing regexp. Periods are no longer allowedKenny Woodson2016-04-048-37/+109
| |
* | Merge pull request #1702 from joelddiaz/heartbeat-severityJoel Diaz2016-04-041-0/+5
|\ \ | | | | | | add higher severity trigger if no heartbeat for 1 hour
| * | add higher severity trigger if no heartbeat for 1 hourJoel Diaz2016-04-041-0/+5
| | |
* | | Fixed oc_edit by requiring name and contentKenny Woodson2016-04-042-4/+6
| | |
* | | Merge pull request #1693 from kwoodson/yedit_enhancementsKenny Woodson2016-04-0415-249/+1311
|\ \ \ | |_|/ |/| | Adding list editing support to yaml editor
| * | Yedit enhancementsKenny Woodson2016-04-0415-249/+1311
| | |
* | | Allow for overriding scheduler configJason DeTiberus2016-03-315-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce openshift_master_scheduler_predicates and openshift_master_scheduler_priorities to override the default scheduler predicates and priorities - switch default scheduler priorities to use SelectorSpreadPriority instead of ServiceSpreadingPriority
* | | Bug 1320829 - Ensure docker installed for factsJason DeTiberus2016-03-3112-82/+170
| | | | | | | | | | | | | | | | | | - gather facts requiring docker only if docker is present and running - Update reference to etcd role in playbooks/common/openshift-etcd/config.yml to use openshift_etcd
* | | Merge pull request #1634 from abutcher/aws-cloud-providerBrenton Leanhardt2016-03-3116-71/+223
|\ \ \ | | | | | | | | AWS cloud provider
| * | | Add AWS cloud provider support.Andrew Butcher2016-03-2916-71/+223
| | | |
* | | | Merge pull request #1684 from brenton/bz1322335Brenton Leanhardt2016-03-311-1/+5
|\ \ \ \ | |_|/ / |/| | | Bug 1322335 - The package name is wrong for rpm upgrade
| * | | Bug 1322335 - The package name is wrong for rpm upgradeBrenton Leanhardt2016-03-301-1/+5
| |/ /
* | | Fixed generate header.Kenny Woodson2016-03-315-5/+5
| | |
* | | Merge pull request #1679 from kwoodson/apirefactorKenny Woodson2016-03-3026-254/+1956
|\ \ \ | |/ / |/| | Refactor of openshiftcli to be more generic.
| * | Moving generation of ansible module side by side with module.Kenny Woodson2016-03-3026-254/+1956
| | |
* | | The systemd unit for atomic-openshift-master wasn't not being createdBrenton Leanhardt2016-03-291-6/+16
| | |
* | | Use openshift.master.ha instead of duplicating the logicBrenton Leanhardt2016-03-292-7/+7
| | |
* | | Workaround for authenticated registriesBrenton Leanhardt2016-03-291-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's no good way to install from a registry that requires authentication. This applies both to RPM and containerized installs: https://bugzilla.redhat.com/show_bug.cgi?id=1316341 The workaround is to 'docker login' as root and then have ansible pull the images to the image cache.
* | | First pass at systemd unit refactorBrenton Leanhardt2016-03-296-96/+104
| | |
* | | Merge pull request #1671 from sjenning/systemd-unit-fixesBrenton Leanhardt2016-03-296-6/+6
|\ \ \ | | | | | | | | make docker service want ose containerized services
| * | | make docker service want ose containerized servicesSeth Jennings2016-03-286-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are points where the docker service is restarted during the install. Sometimes the services that are PartOf docker.service do not get restarted when docker is restarted. https://bugzilla.redhat.com/show_bug.cgi?id=1318948 Systemd documentation recommends using "wants" as the perferred means of creating startup linkages between units. This patch makes the ose services wanted by the docker service rather than multi-user.target. This creates a downward link from the docker service to the ose containerized services.
* | | | fix the key name for the dynamic item of avalablezhizhang2016-03-291-2/+2
| | | |
* | | | Merge pull request #1665 from sdodson/bz1320335Brenton Leanhardt2016-03-2836-218/+422
|\ \ \ \ | |_|/ / |/| | | Sync latest db-templates and qucikstart-templates
| * | | Sync latest db-templates and qucikstart-templatesScott Dodson2016-03-2436-218/+422
| | | |