summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omitOpenShift Bot2017-05-163-0/+16
|\ | | | | Merged by openshift-bot
| * Filter non-strings from the oc_adm_ca_server_cert hostnames parameter.Andrew Butcher2017-05-153-0/+16
| | | | | | | | | | This allows the omit filter to be used in the hostnames parameter list which simplifies conditionally added hostnames.
* | Merge pull request #4196 from dmsimard/paas_repoOpenShift Bot2017-05-161-2/+6
|\ \ | | | | | | Merged by openshift-bot
| * | Don't set-up origin repositories if they've already been configuredDavid Moreau-Simard2017-05-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CentOS ships the 'centos-release-openshift-origin' package which is used to set up the repository and the key. If this package has been installed prior to running openshift-ansible (i.e, to install ansible or openshift-ansible from RPM), it leads to the repository being set up twice in different files. We're now matching the name of the files and since they are identical, it will stay idempotent while not configuring the repositories twice.
* | | Merge pull request #4185 from donnydavis/patch-1OpenShift Bot2017-05-161-1/+1
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Fixed for python3 with Fedora 25 AtomicDonny Davis2017-05-141-1/+1
| | | | | | | | | | | | This is not the only required fix, but this does fix one of the many issues.
* | | | Merge pull request #4178 from mtnbikenc/fix-templatingOpenShift Bot2017-05-167-2/+3
|\ \ \ \ | |_|_|/ |/| | | Merged by openshift-bot
| * | | Fix templating of static service filesRussell Teague2017-05-127-2/+3
| | |/ | |/|
* | | Add docker package for container-engine installSteve Milner2017-05-142-12/+16
| |/ |/| | | | | | | The package is required so that openshift_facts is able to use the docker client to gain information on the versions.
* | Merge pull request #4113 from ↵OpenShift Bot2017-05-133-14/+6
|\ \ | | | | | | | | | | | | jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum Merged by openshift-bot
| * | bug 1448860. Change recovery_after_nodes to match node_quorumJeff Cantrill2017-05-113-14/+6
| | |
* | | Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
| | |/ | |/| | | | | | | | | | This flag is currently being set within the system container via the init.sh
* | | Merge pull request #4172 from ashcrow/1450307OpenShift Bot2017-05-123-12/+10
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
| | | |
| * | | Always add proxy items to atomic.confSteve Milner2017-05-121-4/+1
| | | |
| * | | Move container-engine systemd environment to updated locationSteve Milner2017-05-122-2/+3
| |/ /
* | | Merge pull request #4030 from liggitt/reserved-namespacesOpenShift Bot2017-05-122-0/+4
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Reserve kubernetes and 'kubernetes-' prefixed namespacesJordan Liggitt2017-04-272-0/+4
| | | |
* | | | Merge pull request #4162 from jcantrill/bz1439451_kibana_crashOpenShift Bot2017-05-122-10/+33
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | bug 1441369. Kibana memory limitsJeff Cantrill2017-05-112-10/+33
| | |/ | |/| | | | | | | | | | | | | bug 1439451. Kibana crash (cherry picked from commit 66315ebbfcfda72d6f501c441359d92ec71af7d2)
* | | Merge pull request #4126 from VincentS/SDN_Check_FixJan Chaloupka2017-05-121-1/+1
|\ \ \ | | | | | | | | Fix for OpenShift SDN Check
| * | | Fix for OpenShift SDN CheckVincent Schwarzer2017-05-091-1/+1
| | | |
* | | | Merge pull request #4065 from ingvagabund/introduce-get-rpm-version-roleJan Chaloupka2017-05-1213-67/+106
|\ \ \ \ | | | | | | | | | | Introduce excluder-free rpm version detection role
| * | | | Extend repoquery command (of lib_utils role) to ignore excludersJan Chaloupka2017-05-1113-67/+106
| | | | |
* | | | | 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 #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
| | |_|_|_|/ / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 18:35:45 +0000