summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6895 from ewolinetz/logging_preserve_volume_typeOpenShift Merge Robot2018-01-311-7/+16
|\
| * No longer compare with legacy hosted varEric Wolinetz2018-01-261-2/+2
| * Preserving ES dc storage type unless overridden by inventory variableEric Wolinetz2018-01-261-7/+16
* | Merge pull request #6908 from tzumainn/fix-cinder-mountOpenShift Merge Robot2018-01-314-11/+48
|\ \
| * | fix hostvars parameter nameTzu-Mainn Chen2018-01-292-4/+4
| * | remove mountpoint parameterTzu-Mainn Chen2018-01-291-1/+0
| * | flake cleanupTzu-Mainn Chen2018-01-291-0/+3
| * | code simplification and lint cleanupTzu-Mainn Chen2018-01-291-20/+31
| * | add cinder mountpoint to inventoryTzu-Mainn Chen2018-01-274-1/+25
| |/
* | Merge pull request #6868 from vrutkovs/prefix-provisioner-podOpenShift Merge Robot2018-01-312-2/+13
|\ \
| * | Rework provisioners vars to support different prefix/version for Origin/OSEVadim Rutkovsky2018-01-292-2/+13
* | | Merge pull request #5651 from vareti/NuageEtcdCertsFixOpenShift Merge Robot2018-01-306-9/+95
|\ \ \
| * | | copy etcd client certificates for nuage openshift monitorsareti2018-01-306-9/+95
* | | | Merge pull request #6919 from mfojtik/symlink-kubectl-to-ocOpenShift Merge Robot2018-01-301-1/+1
|\ \ \ \
| * | | | Symlink kubectl to oc instead of openshiftMichal Fojtik2018-01-291-1/+1
* | | | | Merge pull request #6129 from sdodson/contribOpenShift Merge Robot2018-01-303-1/+58
|\ \ \ \ \
| * | | | | Add a bare minimum localhost hosts fileScott Dodson2018-01-303-1/+58
* | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.34.0].Justin Pierce2018-01-302-2/+11
* | | | | | Merge pull request #6934 from vrutkovs/docker_creds-write-decodeOpenShift Merge Robot2018-01-301-1/+3
|\ \ \ \ \ \
| * | | | | | docker_creds: decode docker_config for py3 only if its a stringVadim Rutkovsky2018-01-301-1/+3
* | | | | | | Merge pull request #6928 from ewolinetz/metrics_fix_pvcOpenShift Merge Robot2018-01-301-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Removing ability to change default cassandra_pvc_prefix based on metrics volu...Eric Wolinetz2018-01-291-1/+1
* | | | | | | Merge pull request #6927 from sdodson/1538974OpenShift Merge Robot2018-01-301-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Don't deploy the console if disabled or registry subtypeScott Dodson2018-01-291-0/+8
* | | | | | | | Merge pull request #6925 from mtnbikenc/fix-1538960OpenShift Merge Robot2018-01-308-48/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | [1538960] Correct ability to overried openshift_management_app_templateRussell Teague2018-01-298-48/+54
| |/ / / / / / /
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.33.0].Justin Pierce2018-01-302-2/+5
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.32.0].Justin Pierce2018-01-302-2/+19
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #6923 from openshift/revert-6913-revert-6830-registry_addrOpenShift Merge Robot2018-01-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to...Ben Parees2018-01-291-1/+1
* | | | | | | | Merge pull request #6860 from jpeeler/aggregate-name-changeScott Dodson2018-01-294-106/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | Change catalog roles install to use aggregationJeff Peeler2018-01-244-106/+97
* | | | | | | | | Merge pull request #6889 from mazzystr/fix-port-alignmentOpenShift Merge Robot2018-01-295-63/+82
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix misaligned ports for sg,elb,apiChris Callegari2018-01-255-63/+82
* | | | | | | | | Merge pull request #6215 from sdodson/bz1511870OpenShift Merge Robot2018-01-292-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make IP object a stringFabian von Feilitzsch2018-01-241-1/+2
| * | | | | | | | Add kube service ipaddress to no_proxy listScott Dodson2018-01-242-0/+4
* | | | | | | | | Merge pull request #6909 from spadgett/detect-croOpenShift Merge Robot2018-01-291-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Bug 1539182: Detect if ClusterResourceOverrides enabled during console installSamuel Padgett2018-01-271-1/+6
* | | | | | | | | Merge pull request #6811 from mjudeikis/prometheus-new-templateOpenShift Merge Robot2018-01-299-142/+283
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rebase Prometheus example for new scrape endpoints and expose alert managerMangirdas2018-01-289-142/+283
* | | | | | | | | | Merge pull request #6913 from openshift/revert-6830-registry_addrOpenShift Merge Robot2018-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the...Ben Parees2018-01-271-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6886 from smarterclayton/playbooks/gcp/openshift-cluster/...OpenShift Merge Robot2018-01-271-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add GPG keys in the base image and don't install dockerClayton Coleman2018-01-251-1/+2
* | | | | | | | | | Merge pull request #6905 from mgugino-upstream-stage/fix-crt-typoOpenShift Merge Robot2018-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix container_runtime variable typoMichael Gugino2018-01-261-1/+1
* | | | | | | | | | | Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tagOpenShift Merge Robot2018-01-263-5/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct 3.7 to 3.9 upgrade openshift_image_tagMichael Gugino2018-01-263-5/+29
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.31.0].Jenkins CD Merge Bot2018-01-272-2/+9