summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* allow setting of kibana env varsJeff Cantrill2018-01-264-0/+9
* Merge pull request #6893 from spadgett/console-requestsScott Dodson2018-01-261-0/+6
|\
| * Add prometheus annotations to console serviceSamuel Padgett2018-01-261-0/+2
| * Add resource requests to console templateSamuel Padgett2018-01-261-0/+4
* | Merge pull request #6871 from joelddiaz/oc_group_ignore_usersOpenShift Merge Robot2018-01-262-2/+2
|\ \
| * | ignore 'users' field in oc_group moduleJoel Diaz2018-01-252-2/+2
* | | Automatic commit of package [openshift-ansible] release [3.9.0-0.28.0].Jenkins CD Merge Bot2018-01-262-2/+6
* | | Merge pull request #6862 from ewolinetz/deprecate_use_callbackOpenShift Merge Robot2018-01-263-12/+7
|\ \ \
| * | | Updating deprecations to use callback pluginEric Wolinetz2018-01-254-12/+11
* | | | Merge pull request #6882 from spadgett/console-node-selectorOpenShift Merge Robot2018-01-261-1/+1
|\ \ \ \
| * | | | Run console pods on the masterSamuel Padgett2018-01-251-1/+1
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.26.0].Jenkins CD Merge Bot2018-01-262-2/+7
| |_|_|/ |/| | |
* | | | Merge pull request #6821 from spadgett/remove-asset-configScott Dodson2018-01-268-43/+81
|\ \ \ \
| * | | | Remove old assetConfig from master-config.yamlSamuel Padgett2018-01-257-43/+78
| * | | | Don't emit assetConfig on 3.9Scott Dodson2018-01-251-0/+3
| |/ / /
* | | | Merge pull request #6880 from sosiouxme/20180115-docker-image-locationsOpenShift Merge Robot2018-01-262-13/+47
|\ \ \ \
| * | | | docker_image_availability: containerized overridesLuke Meyer2018-01-252-13/+47
| |/ / /
* | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.25.0].Jenkins CD Merge Bot2018-01-262-2/+23
* | | | Merge pull request #6857 from mtnbikenc/fix-1537946OpenShift Merge Robot2018-01-251-1/+2
|\ \ \ \
| * | | | [1537946] Correct conditional check for GlusterFS IPsRussell Teague2018-01-241-1/+2
* | | | | Merge pull request #6875 from bparees/syncOpenShift Merge Robot2018-01-2521-127/+746
|\ \ \ \ \
| * | | | | sync imagestreams+templates from origin master for v3.9Ben Parees2018-01-2521-127/+746
| | |/ / / | |/| | |
* | | | | Merge pull request #6859 from abutcher/bz1536217OpenShift Merge Robot2018-01-253-0/+99
|\ \ \ \ \
| * | | | | Redeploy etcd certificates during upgrade when etcd hostname not present in e...Andrew Butcher2018-01-243-0/+99
* | | | | | Merge pull request #6878 from mtnbikenc/fix-1502838OpenShift Merge Robot2018-01-251-3/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [1502838] Correct certificate alt name parsingRussell Teague2018-01-251-3/+4
* | | | | | Merge pull request #6865 from giuseppe/node-specify-bind-optionScott Dodson2018-01-251-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | node: specify bind option to /root/.dockerGiuseppe Scrivano2018-01-251-0/+1
* | | | | | Merge pull request #6858 from mtnbikenc/fix-1530403Scott Dodson2018-01-251-1/+5
|\ \ \ \ \ \
| * | | | | | [1530403] Improve etcd group error messageRussell Teague2018-01-241-1/+5
* | | | | | | Merge pull request #6734 from ewolinetz/logging_red_restart_checkScott Dodson2018-01-253-71/+97
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Only automatically restart if cluster is in yellow or green stateEric Wolinetz2018-01-243-71/+97
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6841 from sdodson/bz1491100OpenShift Merge Robot2018-01-251-0/+2
|\ \ \ \ \ \
| * | | | | | Set a default for openshift_hosted_registry_storage_azure_blob_realmScott Dodson2018-01-231-0/+2
| |/ / / / /
* | | | | | Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standardOpenShift Merge Robot2018-01-255-42/+41
|\ \ \ \ \ \
| * | | | | | openshift_manage_node: Label nodes in one passVadim Rutkovsky2018-01-241-14/+6
| * | | | | | Label masters with node-role.kubernetes.io/master. This PR also sets these la...Vadim Rutkovsky2018-01-245-42/+49
* | | | | | | Merge pull request #6626 from pgier/prometheus-remove-tsdb-block-configOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ \ \ \ \
| * | | | | | | openshift_prometheus: remove block duration settingsPaul Gier2018-01-172-2/+2
* | | | | | | | Merge pull request #6848 from mgugino-upstream-stage/remove-fact-labelsOpenShift Merge Robot2018-01-241-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused node.lables from openshift_factsMichael Gugino2018-01-241-3/+0
* | | | | | | | | Merge pull request #6551 from mgugino-upstream-stage/swapoffScott Dodson2018-01-244-62/+148
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Create swapoff moduleMichael Gugino2018-01-244-62/+148
* | | | | | | | | | Merge pull request #6843 from rajatchopra/bugdnsmasqScott Dodson2018-01-242-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change dnsmasq Requires to Wants. https://bugzilla.redhat.com/show_bug.cgi?id...Rajat Chopra2018-01-232-2/+2
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.24.0].Jenkins CD Merge Bot2018-01-242-2/+46
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6842 from mgugino-upstream-stage/protect-upgrade-master-v...Scott Dodson2018-01-249-1/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Protect master installed version during node upgradesMichael Gugino2018-01-239-1/+10
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6819 from fabianvf/1524805-service-catalog-pull-policyOpenShift Merge Robot2018-01-242-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 1524805- ServiceCatalog now works disconnectedFabian von Feilitzsch2018-01-222-2/+2