summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4164 from ashcrow/simplify-daemon-jsonOpenShift Bot2017-05-112-45/+2
|\ | | | | Merged by openshift-bot
| * doc: Add link to daemon.json upstream docSteve Milner2017-05-111-0/+2
| |
| * Remove unused daemon.json keysSteve Milner2017-05-111-45/+0
| | | | | | | | | | | | Instead of providing every possible key in the daemon.json configuration file, this update only provides keys which are actively set/used by the installer.
* | Merge pull request #4115 from ewolinetz/metrics_limits_docsOpenShift Bot2017-05-111-1/+1
|\ \ | | | | | | Merged by openshift-bot
| * | Updating size suffix for metrics in roleewolinetz2017-05-081-1/+1
| | |
* | | Merge pull request #4153 from ewolinetz/bz1449554OpenShift Bot2017-05-111-2/+2
|\ \ \ | |_|/ |/| | Merged by openshift-bot
| * | Updating 3.6 enterprise registry-console template image versionewolinetz2017-05-101-2/+2
| | |
* | | Merge pull request #4158 from ganhuang/lower_boolScott Dodson2017-05-111-2/+2
|\ \ \ | | | | | | | | lower case in /etc/daemon.json and correct block-registry
| * | | lower case in /etc/daemon.json and correct block-registryGan Huang2017-05-111-2/+2
| | | |
* | | | Merge pull request #4156 from mwoodson/fix_yedit_sepsOpenShift Bot2017-05-1129-29/+29
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix for yedit custom separatorsMatt Woodson2017-05-1029-29/+29
| | |/ / | |/| |
* | | | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-104-4/+4
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Default to iptables on masterScott Dodson2017-05-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did this in 3.5 but never on master and we never came back to add migration support. So we'll revert this on master and if/when we add migration support we'll switch the default.
* | | | | Merge pull request #4118 from mtnbikenc/fix-groupsOpenShift Bot2017-05-103-4/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | Temporarily revert to OSEv3 host group usageRussell Teague2017-05-093-4/+7
| | | | |
* | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 05:13:35 +0000