summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4136 from richm/find-log-driverScott Dodson2017-05-102-1/+7
|\ | | | | use docker_log_driver and /etc/docker/daemon.json to determine log driver
| * use docker_log_driver and /etc/docker/daemon.json to determine log driverRich Megginson2017-05-092-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We check the following variables, if they are defined, in the order listed below, to see if the journald log driver is set: * openshift_hosted_logging_use_journal * docker_log_driver * openshift.docker.log_driver * openshift.docker.options (look for '--log-driver=journald') If none of these are set, we leave openshift_logging_fluentd_use_journal undefined, and mount both /etc/sysconfig/docker and /etc/docker (for daemon.json) so that fluentd can determine which log driver is being used.
* | Merge pull request #4109 from ewolinetz/fix_ocobj_absentOpenShift Bot2017-05-102-2/+2
|\ \ | | | | | | Merged by openshift-bot
| * | Updating oc_obj to use get instead of getattrewolinetz2017-05-082-2/+2
| | |
* | | Merge pull request #4124 from ingvagabund/update-etcd-common-readmeOpenShift Bot2017-05-101-9/+28
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | polish etcd_common roleJan Chaloupka2017-05-091-9/+28
| | | |
* | | | Merge pull request #3969 from jarrpa/glusterfs-registry-tooOpenShift Bot2017-05-1015-225/+380
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | GlusterFS: Allow swapping an existing registry's backend storageJose A. Rivera2017-05-046-3/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | GlusterFS: Allow for a separate registry-specific playbookJose A. Rivera2017-05-0411-220/+308
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | GlusterFS: Improve role documentationJose A. Rivera2017-05-041-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | hosted_registry: Get correct pod selector for GlusterFS storageJose A. Rivera2017-05-041-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | hosted registry: Fix typoJose A. Rivera2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | Merge pull request #4033 from ↵Jan Chaloupka2017-05-103-40/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/report-docker-image-version-and-excluder-rpm-version [RFE] report and fail if rpm version differs from docker image version
| * | | | | Fail if rpm version != docker image versionJan Chaloupka2017-05-093-40/+58
| | | | | |
* | | | | | Merge pull request #4116 from abutcher/bz1448824Jan Chaloupka2017-05-101-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix additional master cert & client config creation
| * | | | | | Fix additional master cert & client config creation.Andrew Butcher2017-05-081-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4123 from rhcarvalho/remove-vim-lineRodolfo Carvalho2017-05-109-10/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove vim configuration from Python files
| * | | | | Remove vim configuration from Python filesRodolfo Carvalho2017-05-099-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project where contributors are free to use whatever editor they want and we have linting tools that verify the proper formatting of Python files, it should not be required to have a vim-specific line in Python files.
* | | | | | Merge pull request #4106 from ashcrow/1448384OpenShift Bot2017-05-092-6/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merged by openshift-bot
| * | | | | Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data
* | | | | Merge pull request #4026 from ewolinetz/cherry_picks_15OpenShift Bot2017-05-087-13/+51
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Updating logging and metrics to restart api, ha and controllers when ↵ewolinetz2017-04-285-6/+30
| | | | | | | | | | | | | | | | | | | | updating master config
| * | | | Adding defaults for es_indicesewolinetz2017-04-271-2/+2
| | | | |
| * | | | Updating logic for generating pvcs and their counts to prevent reuse when ↵ewolinetz2017-04-272-7/+21
| | | | | | | | | | | | | | | | | | | | looping
* | | | | Merge pull request #4103 from ganhuang/fix_container_engineOpenShift Bot2017-05-056-24/+27
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Fix 1448368, and some other minors issuesGan Huang2017-05-056-24/+27
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4093 from richm/mux-result-startup-fixScott Dodson2017-05-052-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | mux startup is broken without this fix
| * | | | mux startup is broken without this fixRich Megginson2017-05-042-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-commonJan Chaloupka2017-05-043-1/+3
|\ \ \ \ | | | | | | | | | | move etcdctl.yml from etcd to etcd_common role
| * | | | move etcdctl.yml from etcd to etcd_common roleJan Chaloupka2017-05-033-1/+3
| | | | |
* | | | | Merge pull request #4044 from mtnbikenc/clean-cacheOpenShift Bot2017-05-041-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Ensure repo cache is clean on the first runRussell Teague2017-05-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The openshift_repos role is modified to clean the repo cache on first run to ensure a clean cache in the situation where the repo files have been changed manually, such as just prior to upgrades.
* | | | | | Merge pull request #4089 from mtnbikenc/unicode-decodeOpenShift Bot2017-05-0428-28/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Allow oc_ modules to pass unicode resultsRussell Teague2017-05-0328-28/+28
| | | | | | |
* | | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswdOpenShift Bot2017-05-041-7/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Merged by openshift-bot
| * | | | | | Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-021-7/+9
| | | | | | |
* | | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083OpenShift Bot2017-05-035-14/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Correctly setting the primary and replica shard count settingsewolinetz2017-05-035-14/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4049 from ashcrow/system-container-dockerOpenShift Bot2017-05-0315-122/+370
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Merged by openshift-bot
| * | | | | | System container dockerSteve Milner2017-05-0315-122/+370
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows for the use of either the traditional package install of docker OR a system container install of docker. Two new inventory options, openshift_docker_use_system_container and openshift_docker_systemcontainer_image_registry_override, have been added which are be used to install with a system container. By default this option is commented out. One new fact has been added: - docker.service_name: docker by default, container-engine-docker for system container
* | | | | | Merge pull request #4080 from dgoodwin/aws-cred-no-logOpenShift Bot2017-05-031-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Stop logging AWS credentials in master role.Devan Goodwin2017-05-031-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using lineinfile and with_items, the items end up logged and in this case include AWS credentials. Simple us of no_log to hide them.
* | | | | | Merge pull request #4062 from abutcher/atomicf25OpenShift Bot2017-05-032-7/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merged by openshift-bot
| * | | | | Remove set operations from openshift_master_certificates iteration.Andrew Butcher2017-05-021-4/+4
| | | | | |
| * | | | | Refactor system fact gathering to avoid dictionary size change during iteration.Andrew Butcher2017-05-021-3/+5
| | | | | |
* | | | | | Merge pull request #4070 from ewolinetz/mux_scaleup_fixOpenShift Bot2017-05-022-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Making mux with_items list evaluate as empty if didnt get objects beforeewolinetz2017-05-022-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4059 from sdodson/master-1.5-caOpenShift Bot2017-05-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merged by openshift-bot
| * | | | | Use openshift_ca_host's hostnames to sign the CAScott Dodson2017-05-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | If for some reason oo_first_master and openshift_ca_host are different we could've signed the CA with the wrong hostnames.
* | | | | Merge pull request #4028 from ewolinetz/logging_project_ns_labelsOpenShift Bot2017-05-022-11/+34
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 02:07:25 +0000