summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #1680 from detiber/scheduler_configBrenton Leanhardt2016-04-015-18/+26
|\ | | | | Allow for overriding scheduler config
| * 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
* Automatic commit of package [openshift-ansible] release [3.0.69-1].Brenton Leanhardt2016-03-312-2/+10
|
* Merge pull request #1674 from detiber/bz1320829Brenton Leanhardt2016-03-3113-83/+171
|\ | | | | Bug 1320829 - Ensure docker installed for facts
| * Bug 1320829 - Ensure docker installed for factsJason DeTiberus2016-03-3113-83/+171
|/ | | | | | - 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 #1690 from brenton/bz1322788Brenton Leanhardt2016-03-311-0/+5
|\ | | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-mast…
| * Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api ↵Brenton Leanhardt2016-03-311-0/+5
|/ | | | and atomic-openshift-master-controllers
* Merge pull request #1634 from abutcher/aws-cloud-providerBrenton Leanhardt2016-03-3119-71/+295
|\ | | | | AWS cloud provider
| * Add AWS cloud provider support.Andrew Butcher2016-03-2919-71/+295
| |
* | Merge pull request #1684 from brenton/bz1322335Brenton Leanhardt2016-03-312-1/+22
|\ \ | | | | | | Bug 1322335 - The package name is wrong for rpm upgrade
| * | Bug 1322335 - The package name is wrong for rpm upgradeBrenton Leanhardt2016-03-302-1/+22
| | |
* | | Merge pull request #1689 from kwoodson/yedit_header_fixKenny Woodson2016-03-315-5/+5
|\ \ \ | | | | | | | | Fixed header for yedit
| * | | Fixed generate header.Kenny Woodson2016-03-315-5/+5
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.0.68-1].Troy Dawson2016-03-302-2/+8
| | |
* | | Merge pull request #1679 from kwoodson/apirefactorKenny Woodson2016-03-3028-410/+1969
|\ \ \ | | | | | | | | Refactor of openshiftcli to be more generic.
| * | | Moving generation of ansible module side by side with module.Kenny Woodson2016-03-3028-410/+1969
| | | |
* | | | Merge pull request #1682 from brenton/bz1322338Brenton Leanhardt2016-03-302-0/+4
|\ \ \ \ | |_|/ / |/| | | Bug 1322338 - The upgrade should keep the option insecure-registry=17…
| * | | Bug 1322338 - The upgrade should keep the option insecure-registry=172.30.0.0/16Brenton Leanhardt2016-03-302-0/+4
|/ / /
* | / Automatic commit of package [openshift-ansible] release [3.0.67-1].Troy Dawson2016-03-292-2/+13
| |/ |/|
* | Merge pull request #1666 from brenton/systemd1Brenton Leanhardt2016-03-2911-163/+209
|\ \ | | | | | | Reusing the systemd templates for the upgrade
| * | 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-294-16/+10
| | |
| * | Workaround for authenticated registriesBrenton Leanhardt2016-03-292-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2910-154/+146
|/ /
* | 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.
* | | Merge pull request #1673 from BlueShells/bugfix_for_dynamicpvZhiMing Zhang2016-03-291-2/+2
|\ \ \ | | | | | | | | fix the key name for the dynamic item of avalable
| * | | fix the key name for the dynamic item of avalablezhizhang2016-03-291-2/+2
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.0.66-1].Troy Dawson2016-03-282-2/+17
| | |
* | | 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
| | |
* | | Merge pull request #1592 from detiber/fixAuthFilterBrenton Leanhardt2016-03-281-7/+6
|\ \ \ | | | | | | | | Attempt to fix error validating when extraScopes and extraAuthorizePa…
| * | | Attempt to fix error validating when extraScopes and ↵Jason DeTiberus2016-03-111-7/+6
| | | | | | | | | | | | | | | | extraAuthorizeParameters are not present
* | | | Merge pull request #1638 from JayKayy/loggingBrenton Leanhardt2016-03-288-0/+203
|\ \ \ \ | |_|_|/ |/| | | Adding openshift_efk role
| * | | added admin binary varibale usage as well as specifying kubeconfig copy to ↵John Kwiatkoski2016-03-252-33/+29
| | | | | | | | | | | | | | | | be used
| * | | adding playbookJohn Kwiatkoski2016-03-231-0/+6
| | | |
| * | | Tested of refactored codeJohn Kwiatkoski2016-03-236-75/+60
| | | |
| * | | revised and restructured logging roleJohn Kwiatkoski2016-03-228-113/+135
| | | |
| * | | Adding openshift_efk roleJohn Kwiatkoski2016-03-183-0/+194
| | | |
* | | | Merge pull request #1669 from kwoodson/fix_yeditKenny Woodson2016-03-281-1/+1
|\ \ \ \ | | | | | | | | | | Added error message for yedit when yaml fails to parse.
| * | | | Fixed error message to add valid yamlKenny Woodson2016-03-281-1/+1
|/ / / /
* | | | Merge pull request #1649 from BlueShells/pv_workZhiMing Zhang2016-03-281-0/+35
|\ \ \ \ | | | | | | | | | | add dynamic pv count
| * | | | fix some typoZhiming Zhang2016-03-221-1/+1
| | | | |
| * | | | add the total and available space itemZhiming Zhang2016-03-221-0/+12
| | | | |
| * | | | add dynamic pv countZhiming Zhang2016-03-221-0/+23
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.65-1].Troy Dawson2016-03-242-2/+6
| | | | |
* | | | | Merge pull request #1664 from kwoodson/api_dcKenny Woodson2016-03-243-68/+490
|\ \ \ \ \ | | | | | | | | | | | | Deployment config module
| * | | | | Adding deployment config and refactored.Kenny Woodson2016-03-243-68/+490
| | | | | |
* | | | | | Merge pull request #1575 from enoodle/manageiq_sa_to_have_image_puller_roleBrenton Leanhardt2016-03-242-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | ManageIQ SA: Adding image-puller role