summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4131 from ashcrow/1448800Scott Dodson2017-05-1020-48/+152
|\ | | | | Update systemd units to use proper container service name
| * Add service file templates for master and nodeSteve Milner2017-05-096-1/+105
| | | | | | | | | | | | | | Adds service file templates for both maste and node. These will lay down in /etc/system/systemd to override what may already be present from a package. These instances take into account the name of the container daemon (docker or container-engine).
| * Update systemd units to use proper container service nameSteve Milner2017-05-0914-47/+47
| | | | | | | | | | | | | | - If using a system container: container-engine - If using a package install: docker Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1448800
* | Merge pull request #4147 from ashcrow/lowercase-trueScott Dodson2017-05-102-2/+3
|\ \ | | | | | | Ensure true is lowercase in daemon.json
| * | Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
| | | | | | | | | | | | | | | The daemon.json configuration key is block-registries. The code and installer bits call it blocked-registries.
| * | Ensure true is lowercase in daemon.jsonSteve Milner2017-05-102-1/+2
| | |
* | | Merge pull request #3967 from jarrpa/oc_volume-docOpenShift Bot2017-05-102-0/+24
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | oc_volume: Add missing parameter documentationJose A. Rivera2017-04-212-0/+24
| | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | 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 #4129 from rhcarvalho/document-redhat-ci-jobScott Dodson2017-05-101-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Note existence of Fedora tests and how to rerun
| * | | | | | Note existence of Fedora tests and how to rerunRodolfo Carvalho2017-05-091-0/+9
| | | | | | |
* | | | | | | Merge pull request #4124 from ingvagabund/update-etcd-common-readmeOpenShift Bot2017-05-102-10/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | polish etcd_common roleJan Chaloupka2017-05-092-10/+28
| | | | | | | |
* | | | | | | | Merge pull request #3969 from jarrpa/glusterfs-registry-tooOpenShift Bot2017-05-1028-233/+607
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | GlusterFS: Allow swapping an existing registry's backend storageJose A. Rivera2017-05-048-5/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | GlusterFS: Allow for a separate registry-specific playbookJose A. Rivera2017-05-0421-222/+433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | GlusterFS: Improve role documentationJose A. Rivera2017-05-044-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.67-1].Scott Dodson2017-05-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag
* | | | | | | | | Merge pull request #4117 from sdodson/flatten_upgrade_pkgsOpenShift Bot2017-05-101-22/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Perform package upgrades in one transactionScott Dodson2017-05-081-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this we were pullining in unbounded dependencies and upgrading to the latest version available in a repo.
* | | | | | | | | 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 #4130 from giuseppe/fix-audit-docScott Dodson2017-05-102-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | byo: correct option name
| * | | | | | | | | | byo: correct option nameGiuseppe Scrivano2017-05-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct name is "enabled', not "basicAuditEnabled" Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1439619 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | Merge pull request #4097 from mtnbikenc/fix-version-checkScott Dodson2017-05-101-25/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Properly fail on empty repoquery version checks
| * | | | | | | | | | | Properly fail if OpenShift RPM version is undefinedRussell Teague2017-05-081-25/+29
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.66-1].Scott Dodson2017-05-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version
* | | | | | | | | | | 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-1019-43/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Remove vim configuration from Python files
| * | | | | | | | | | | Remove vim configuration from Python filesRodolfo Carvalho2017-05-0919-43/+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 #4135 from mtnbikenc/fix-travisScott Dodson2017-05-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix issue with Travis-CI using old pip version
| * | | | | | | | | | Fix issue with Travis-CI using old pip versionRussell Teague2017-05-091-0/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* / | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.62-1].Jenkins CD Merge Bot2017-05-092-2/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | / / / / / / / Automatic commit of package [openshift-ansible] release [3.6.61-1].Jenkins CD Merge Bot2017-05-092-2/+5
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.60-1].Jenkins CD Merge Bot2017-05-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.59-1].Jenkins CD Merge Bot2017-05-082-2/+9
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | 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
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.58-1].Jenkins CD Merge Bot2017-05-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Merge pull request #4114 from jupierce/move_imagesScott Dodson2017-05-088-0/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Moving Dockerfile content to images dir
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 02:21:07 +0000