summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5564 from jcantrill/es_promOpenShift Merge Robot2017-10-057-5/+159
|\
| * Add logging es prometheus endpointJeff Cantrill2017-10-037-5/+159
* | Merge pull request #5616 from wozniakjan/logging/elasticsearch/honor_es_cpu_s...OpenShift Merge Robot2017-10-041-1/+1
|\ \
| * | logging: honor openshift_logging_es_cpu_limitJan Wozniak2017-10-021-1/+1
* | | Merge pull request #5636 from mgugino-upstream-stage/limit-openshift-version-...OpenShift Merge Robot2017-10-041-2/+2
|\ \ \
| * | | Limit hosts that run openshift_version roleMichael Gugino2017-10-031-2/+2
* | | | Merge pull request #5647 from mgugino-upstream-stage/docker-reg-auth-after-startOpenShift Merge Robot2017-10-041-12/+12
|\ \ \ \
| * | | | Ensure docker service started prior to credentialsMichael Gugino2017-10-031-12/+12
* | | | | Merge pull request #5543 from ewolinetz/bz1495150OpenShift Merge Robot2017-10-041-4/+0
|\ \ \ \ \
| * | | | | Removing setting pvc size and dynamic to remove looped var settingEric Wolinetz2017-09-261-4/+0
* | | | | | Merge pull request #5643 from mtnbikenc/refactor-certificatesOpenShift Merge Robot2017-10-0410-57/+15
|\ \ \ \ \ \
| * | | | | | Remove unused tasks file in openshift_named_certificatesRussell Teague2017-10-031-32/+0
| * | | | | | Move node cert playbook into node config pathRussell Teague2017-10-033-4/+2
| * | | | | | Move master cert playbooks into master config pathRussell Teague2017-10-036-17/+9
| * | | | | | Move etcd cert playbooks into etcd config pathRussell Teague2017-10-032-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5566 from ewolinetz/bz1415297OpenShift Merge Robot2017-10-043-25/+66
|\ \ \ \ \ \
| * | | | | | Addressing tox issuesEric Wolinetz2017-09-292-5/+8
| * | | | | | Checking if any openshift_*_storage_kind variables are set to dynamic without...Eric Wolinetz2017-09-273-25/+63
* | | | | | | Merge pull request #5314 from fabianvf/asb-config-updateOpenShift Merge Robot2017-10-0418-131/+313
|\ \ \ \ \ \ \
| * | | | | | | Update ansible-service-broker config to track latest brokerFabian von Feilitzsch2017-10-0218-131/+313
* | | | | | | | Merge pull request #5664 from jfchevrette/patch-4Scott Dodson2017-10-041-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove duplicate [OSEv3:children] groupJean-Francois Chevrette2017-10-041-5/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #5656 from ephillipe/patch-1Scott Dodson2017-10-042-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update hosts.ose.exampleErick Almeida2017-10-041-1/+1
| * | | | | | | | Update hosts.origin.exampleErick Almeida2017-10-041-1/+1
* | | | | | | | | Merge pull request #5648 from jcantrill/1497401_default_image_versionsScott Dodson2017-10-042-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | bug 1497401. Default logging and metrics images to 3.7Jeff Cantrill2017-10-032-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectorsOpenShift Merge Robot2017-10-032-7/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix hosted selector variable migrationMichael Gugino2017-10-032-7/+4
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.143.0].Jenkins CD Merge Bot2017-10-042-2/+6
* | | | | | | | | Merge pull request #5606 from mgugino-upstream-stage/provision-scale-elb-fixe...OpenShift Merge Robot2017-10-032-5/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix provisiong scale group and elb logicMichael Gugino2017-09-294-11/+21
* | | | | | | | | | Merge pull request #5632 from mgugino-upstream-stage/limit-version-upgrade-ma...OpenShift Merge Robot2017-10-036-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Limit base-package install during master upgradesMichael Gugino2017-10-026-1/+9
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.142.0].Jenkins CD Merge Bot2017-10-032-2/+15
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #5633 from mgugino-upstream-stage/fix-node-cloudproviderOpenShift Merge Robot2017-10-032-16/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move node aws credentials to config.ymlMichael Gugino2017-10-022-16/+16
* | | | | | | | | | | Merge pull request #5638 from sdodson/bz1488366Scott Dodson2017-10-032-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document that nfs_directory must conform to DNS-1123Scott Dodson2017-10-032-0/+8
* | | | | | | | | | | | Merge pull request #5621 from abutcher/scaleup-portal-netOpenShift Merge Robot2017-10-031-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Ensure openshift.common.portal_net updated during scaleup.Andrew Butcher2017-10-021-1/+7
* | | | | | | | | | | | Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-oseOpenShift Merge Robot2017-10-033-9/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | docker: fix some tox warningsGiuseppe Scrivano2017-09-271-6/+6
| * | | | | | | | | | | Require openshift_image_tag in the inventory with openshift-enterpriseGiuseppe Scrivano2017-09-271-0/+8
| * | | | | | | | | | | crio: use the image_tag on RHELGiuseppe Scrivano2017-09-271-2/+11
| * | | | | | | | | | | docker: use the image_tag on RHELGiuseppe Scrivano2017-09-271-1/+10
* | | | | | | | | | | | Merge pull request #5630 from abutcher/etcd-scaleup-targetOpenShift Merge Robot2017-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use etcd_ip when communicating with the cluster as a peer in etcd scaleup.Andrew Butcher2017-10-021-1/+1
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.141.0].Jenkins CD Merge Bot2017-10-032-2/+7
* | | | | | | | | | | | Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regsOpenShift Merge Robot2017-10-031-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \