summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6830 from bparees/registry_addrOpenShift Merge Robot2018-01-241-1/+1
|\
| * use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registr...Ben Parees2018-01-231-1/+1
* | Merge pull request #6603 from joelddiaz/fetch_subnet_azOpenShift Merge Robot2018-01-243-3/+36
|\ \
| * | un-hardcode default subnet azJoel Diaz2018-01-223-3/+36
* | | Merge pull request #6786 from simaishi/cf_46_betaOpenShift Merge Robot2018-01-2424-931/+4727
|\ \ \
| * | | Update CF 4.6 Beta templates in openshift_management directorySatoe Imaishi2018-01-244-29/+415
| * | | Add templates to v3.9Satoe Imaishi2018-01-1910-451/+2156
| * | | Use Beta repo pathSatoe Imaishi2018-01-184-13/+13
| * | | CF 4.6 templatesSatoe Imaishi2018-01-1810-451/+2156
* | | | Merge pull request #6839 from mtnbikenc/fix-1506866OpenShift Merge Robot2018-01-241-1/+2
|\ \ \ \
| * | | | [1506866] Update haproxy.cfg.j2Russell Teague2018-01-231-1/+2
* | | | | Merge pull request #6767 from mazzystr/fix-master-internal-elbKenny Woodson2018-01-242-2/+2
|\ \ \ \ \
| * | | | | Fix to master-internal elb schemeChris Callegari2018-01-172-2/+2
* | | | | | Merge pull request #6815 from vrutkovs/failed_when-rc-to-intOpenShift Merge Robot2018-01-242-15/+5
|\ \ \ \ \ \
| * | | | | | failed_when lists are implicitely ANDs, not ORsVadim Rutkovsky2018-01-222-15/+5
* | | | | | | Merge pull request #6749 from sdodson/allow-5-etcd-masterScott Dodson2018-01-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow 5 etcd hostsScott Dodson2018-01-161-1/+1
* | | | | | | | Merge pull request #6718 from sdodson/bz1533658Scott Dodson2018-01-241-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused symlinkScott Dodson2018-01-131-1/+0
* | | | | | | | | Merge pull request #6846 from vrutkovs/installer-unwrap-helpScott Dodson2018-01-241-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | installer: increase content width for commands, which may output URLsVadim Rutkovsky2018-01-241-2/+2
* | | | | | | | | | Merge pull request #6836 from spadgett/rollout-only-if-changedOpenShift Merge Robot2018-01-241-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only rollout console if config changedSamuel Padgett2018-01-231-1/+2
* | | | | | | | | | | Merge pull request #6541 from smarterclayton/move_gcp_inScott Dodson2018-01-2455-115/+1550
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Split control plane and component install in deploy_clusterClayton Coleman2018-01-237-88/+90
| * | | | | | | | | | PyYAML is required by openshift_facts on nodesClayton Coleman2018-01-231-0/+2
| * | | | | | | | | | Move origin-gce roles and playbooks into openshift-ansibleClayton Coleman2018-01-2349-30/+1461
| * | | | | | | | | | Directly select the ansible versionClayton Coleman2018-01-231-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6835 from mtnbikenc/fix-1537105OpenShift Merge Robot2018-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [1537105] Add openshift_facts to flannel roleRussell Teague2018-01-231-0/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6833 from joelddiaz/boto3-rhel7OpenShift Merge Robot2018-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update Dockerfile to add boto3 dependencyJoel Diaz2018-01-231-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6837 from spadgett/croOpenShift Merge Robot2018-01-232-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add clusterResourceOverridesEnabled to console configSamuel Padgett2018-01-232-0/+3
* | | | | | | | | | Merge pull request #6802 from mgugino-upstream-stage/fix-etcd-scaleupOpenShift Merge Robot2018-01-234-3/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix etcd scaleup playbookMichael Gugino2018-01-224-3/+56
* | | | | | | | | | | Merge pull request #6827 from vrutkovs/node-uppercase-certificatesOpenShift Merge Robot2018-01-233-12/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Lowercase node names when creating certificatesVadim Rutkovsky2018-01-233-12/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #6682 from giuseppe/fix-registriesMichael Gugino2018-01-232-27/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| * | | | | | | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| * | | | | | | | | | | docker: use image from CentOS and Fedora registriesGiuseppe Scrivano2018-01-101-6/+6
| * | | | | | | | | | | crio: use Docker and CentOS registries for the imageGiuseppe Scrivano2018-01-101-19/+8
* | | | | | | | | | | | Merge pull request #6808 from spadgett/check-console-config-existsOpenShift Merge Robot2018-01-231-36/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug 1534020 - Only set logging and metrics URLs if console config map existsSamuel Padgett2018-01-211-36/+41
* | | | | | | | | | | | | Merge pull request #6817 from mtnbikenc/fix-1506750OpenShift Merge Robot2018-01-234-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [1506750] Ensure proper hostname check overrideRussell Teague2018-01-224-7/+7
* | | | | | | | | | | | | | Merge pull request #6783 from mgugino-upstream-stage/node-syscon-add-mountsScott Dodson2018-01-233-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add ability to mount volumes into system container nodesMichael Gugino2018-01-183-0/+45
* | | | | | | | | | | | | | Merge pull request #6812 from sdodson/bz1396350OpenShift Merge Robot2018-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |