Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5342 from mtnbikenc/fix-include-through-symlink | Scott Dodson | 2017-09-11 | 1 | -1/+1 |
|\ | | | | | Correct include path to not follow symlink | ||||
| * | Correct include path to not follow symlink | Russell Teague | 2017-09-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5332 from kwoodson/amibuild_node_config | OpenShift Bot | 2017-09-11 | 4 | -9/+12 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | ami build process calls openshift-node/config.yml | Kenny Woodson | 2017-09-07 | 4 | -9/+12 |
| | | | |||||
* | | | Merge pull request #5338 from mtnbikenc/fix-pre_upgrade | OpenShift Bot | 2017-09-11 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Fix issue with etcd_common when using pre_upgrade tag | Russell Teague | 2017-09-08 | 2 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #5339 from mtnbikenc/fix-upgrade-path | OpenShift Bot | 2017-09-09 | 1 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Merged by openshift-bot | ||||
| * | | | Fix include path for docker upgrade tasks | Russell Teague | 2017-09-08 | 1 | -2/+4 |
| |/ / | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.125.1]. | Scott Dodson | 2017-09-08 | 2 | -2/+32 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --use-version 3.7.0 --use-release 0.125.1%{?dist} | ||||
* | | | Merge pull request #5289 from jcantrill/1487573_fix_allowed_es_version | OpenShift Bot | 2017-09-08 | 5 | -10/+10 |
|\ \ \ | |/ / |/| | | Merged by openshift-bot | ||||
| * | | bug 1487573. Bump the allowed ES versions | Jeff Cantrill | 2017-09-01 | 5 | -10/+10 |
| | | | |||||
* | | | Merge pull request #5209 from wozniakjan/logging_es_probe | OpenShift Bot | 2017-09-07 | 2 | -1/+15 |
|\ \ \ | |_|/ |/| | | Merged by openshift-bot | ||||
| * | | elasticsearch: reintroduce readiness probe | Jan Wozniak | 2017-08-29 | 2 | -1/+15 |
| | | | |||||
* | | | Merge pull request #5211 from kwoodson/provisioning_fixes | Scott Dodson | 2017-09-07 | 57 | -1554/+1155 |
|\ \ \ | | | | | | | | | Provisioning updates. | ||||
| * | | | Consolidating AWS roles and variables underneath openshift_aws role. | Kenny Woodson | 2017-09-07 | 57 | -1618/+1149 |
| | | | | |||||
| * | | | Fixing variables and allowing custom ami. | Kenny Woodson | 2017-09-07 | 6 | -42/+112 |
| | | | | |||||
* | | | | Merge pull request #5329 from mgugino-upstream-stage/typo-fix | Andrew Butcher | 2017-09-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix README.md typo | ||||
| * | | | | Fix README.md typo | Michael Gugino | 2017-09-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | Small typo in README.md. | ||||
* | | | | Merge pull request #5305 from mtnbikenc/breakout-master-additional | OpenShift Bot | 2017-09-07 | 3 | -3/+8 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | Move master additional config out of base | Russell Teague | 2017-09-05 | 3 | -3/+8 |
| | | | | |||||
* | | | | Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common | OpenShift Bot | 2017-09-07 | 69 | -399/+199 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Remove openshift-common | Michael Gugino | 2017-09-06 | 69 | -399/+199 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this role's purpose was to set facts. The vast majority of these facts were simply redefining user-supplied variables. This commit also removes various artifacts leftover from previous versions, as well as variables that seem to be entirely unused. | ||||
* | | | | | Merge pull request #5310 from ashcrow/split-rhel-centos-crio | OpenShift Bot | 2017-09-07 | 1 | -2/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | cri-o: Split RHEL and CentOS images | Steve Milner | 2017-09-06 | 1 | -2/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #5162 from aerialls/patch-2 | OpenShift Bot | 2017-09-07 | 1 | -9/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | reverse order between router cert generation | Julien Brochet | 2017-08-23 | 1 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | ensured to always use a certificate for the router | Julien Brochet | 2017-08-22 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5296 from nak3/skeopeo-command-output | OpenShift Bot | 2017-09-06 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | output skopeo image check command | Kenjiro Nakayama | 2017-09-05 | 1 | -4/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5276 from richm/master | OpenShift Bot | 2017-09-06 | 5 | -1/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | logging set memory request to limit | Jeff Cantrill | 2017-08-30 | 5 | -1/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #5148 from kwoodson/registry_proxy_updates | OpenShift Bot | 2017-09-06 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | Adding proxy env vars for dc/docker-registry | Kenny Woodson | 2017-08-21 | 1 | -0/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5067 from e-minguez/flannel_use_sdn_cluster_network_cidr | Scott Dodson | 2017-09-06 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use the proper pod subnet instead the services one | ||||
| * | | | | | | | | | | Use the proper pod subnet instead the services one | Eduardo Minguez Perez | 2017-08-29 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4809 ? | ||||
* | | | | | | | | | | | Merge pull request #5299 from jhadvig/dnf_issue | Scott Dodson | 2017-09-06 | 3 | -12/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Import dnf only if importing yum fails | ||||
| * | | | | | | | | | | | openshift_checks aos_version: also check installed under yum | Luke Meyer | 2017-09-06 | 3 | -17/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweaks to the logic around using yum vs dnf; now uses ansible_pkg_mgr to determine which is in effect for a host. Also, extended the yum logic to check installed packages in addition to available packages in the aos_version module so that disconnected installs and others with weird repo configs need not disable the package_version check. | ||||
| * | | | | | | | | | | | Import dnf only if importing yum fails | Jakub Hadvig | 2017-09-05 | 1 | -6/+12 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #5202 from giuseppe/crio-additional-registries | OpenShift Bot | 2017-09-06 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | | cri-o: add support for additional registries | Giuseppe Scrivano | 2017-08-24 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | | | | | | | | Merge pull request #5313 from sjenning/remove-experimental-cri-flag | Scott Dodson | 2017-09-06 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | remove experimental-cri flag from node config | ||||
| * | | | | | | | | | | | | remove experimental-cri flag from node config | Seth Jennings | 2017-09-06 | 1 | -2/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #5317 from sdodson/master | Scott Dodson | 2017-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Fix openshift_master_config_dir | ||||
| * | | | | | | | | | | | | Fix openshift_master_config_dir | Scott Dodson | 2017-09-06 | 1 | -1/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #5306 from mgugino-upstream-stage/fix-master-systemd-units | OpenShift Bot | 2017-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | | | | Fix: set openshift_master_config_dir to the correct value. | Michael Gugino | 2017-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit set 'openshift_master_config_dir' to '/var/lib/origin' if undefined during upgrades. This commit sets value to the proper directory '/etc/origin' | ||||
* | | | | | | | | | | | | | Merge pull request #4509 from zgalor/prometheus-role | Scott Dodson | 2017-09-06 | 21 | -1/+1058 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create ansible role for deploying prometheus on openshift | ||||
| * | | | | | | | | | | | | | Create ansible role for deploying prometheus on openshift | Zohar Galor | 2017-09-06 | 21 | -1/+1058 |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new role for installing prometheus on openshift. Depends on `openshift_hosted_prometheus_deploy` flag role creates: - prometheus namespace - prometheus clusterrolebinding and service account - pvs for prometheus, alertmanager and alertbuffer for internal nfs - prometheus pod with prometheus behind oauth-proxy, alertmanager and alert-buffer behind oauth-proxy - prometheus and alertmanager configmaps - prometheus and alerts services and direct routes - prometheus, alertmanager and alert-buffer pvcs | ||||
* | | | | | | | | | | | | | Merge pull request #5102 from ilackarms/fix-pv-template | Scott Dodson | 2017-09-06 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | only evaluate openshift_cfme_nfs_server if using nfs | ||||
| * | | | | | | | | | | | | skip openshift_cfme_nfs_server if not using nfs | Scott Weiss | 2017-09-03 | 2 | -3/+7 |
| | | | | | | | | | | | | |