summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [1537946] Correct conditional check for GlusterFS IPsRussell Teague2018-01-241-1/+2
|
* Merge pull request #6786 from simaishi/cf_46_betaOpenShift Merge Robot2018-01-2424-931/+4727
|\ | | | | | | | | | | | | Automatic merge from submit-queue. CF 4.6 Beta templates for OpenShift v3.7 and v3.9 cc @sdodson @Loicavenel
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1506866] Update haproxy.cfg.j2 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506866
| * | [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 scheme
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. failed_when lists are implicitely ANDs, not ORs For some reason I believed `failed_when` lists are considered to be ORs, but it turns out these are ANDs. Fixes bug 1534538 Relates to #6751
| * | | | failed_when lists are implicitely ANDs, not ORsVadim Rutkovsky2018-01-222-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/ansible/ansible/issues/18311#issuecomment-258048690
* | | | | Merge pull request #6749 from sdodson/allow-5-etcd-masterScott Dodson2018-01-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Allow 5 etcd hosts
| * | | | | Allow 5 etcd hostsScott Dodson2018-01-161-1/+1
| | | | | |
* | | | | | Merge pull request #6718 from sdodson/bz1533658Scott Dodson2018-01-241-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused symlink
| * | | | | | 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 URLs
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Only rollout console if config changed /assign @sdodson @jwforres FYI
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Allow openshift-ansible image to deploy to GCP
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all core functionality into the openshift-ansible repo, adds the necessary equivalent entrypoint to the openshift-ansible installer image, and ensures the dynamic inventory mechanisms in openshift-ansible continue to work. Notable changes from origin-gce: * playbook extensions changed to .yml * dynamic inventory subdirectory created to prevent accidental use * use the custom entrypoint entrypoint-gcp for this image * move tasks into openshift_gcp role
| * | | | | | | | Directly select the ansible versionClayton Coleman2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add libcloud (required for dynamic GCE lookup) and which (relied on by gcloud).
* | | | | | | | | Merge pull request #6835 from mtnbikenc/fix-1537105OpenShift Merge Robot2018-01-231-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1537105] Add openshift_facts to flannel role Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537105
| * | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. update Dockerfile to add boto3 dependency
| * | | | | | | | | update Dockerfile to add boto3 dependencyJoel Diaz2018-01-231-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | The centos-based Dockerfile has previously been updated to pull in the python2-boto3 RPM; update the RHEL-based Dockerfile to do the same now that python2-boto3 has been made available in the appropriate repo.
* | | | | | | | | Merge pull request #6837 from spadgett/croOpenShift Merge Robot2018-01-232-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add clusterResourceOverridesEnabled to console config Adds clusterResourceOverridesEnabled flag to console install. See https://github.com/openshift/api/pull/32 See https://github.com/openshift/origin/pull/18231 /assign @sdodson /cc @jwforres
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix etcd scaleup playbook Currently, etcd scaleup playbook has no way to account for newly added prerequisites.yml play. This commit allows adding new etcd hosts via scaleup play and accounts for etcd hosts that are standalone or part of nodes or masters group.
| * | | | | | | | | Fix etcd scaleup playbookMichael Gugino2018-01-224-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, etcd scaleup playbook has no way to account for newly added prerequisites.yml play. This commit allows adding new etcd hosts via scaleup play and accounts for etcd hosts that are standalone or part of nodes or masters group.
* | | | | | | | | | Merge pull request #6827 from vrutkovs/node-uppercase-certificatesOpenShift Merge Robot2018-01-233-12/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Lowercase node names when creating certificates Additional fix for https://github.com/openshift/openshift-ansible/pull/6812
| * | | | | | | | | | Lowercase node names when creating certificatesVadim Rutkovsky2018-01-233-12/+12
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6682 from giuseppe/fix-registriesMichael Gugino2018-01-232-27/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | CRI-O, Docker: Use images from the CentOS and Fedora registry
| * | | | | | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Object of type 'bytes' is not JSON serializable Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | | | docker_creds: fix python3 exceptionGiuseppe Scrivano2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves this exception with python3: TypeError: a bytes-like object is required, not 'str Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | | | docker: use image from CentOS and Fedora registriesGiuseppe Scrivano2018-01-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1534020 - Only set logging and metrics URLs if console config map exists Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020 Related to #6676, but for the tasks that update logging and metrics URLs. /king bug /assign @sdodson
| * | | | | | | | | | | Bug 1534020 - Only set logging and metrics URLs if console config map existsSamuel Padgett2018-01-211-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534020
* | | | | | | | | | | | Merge pull request #6817 from mtnbikenc/fix-1506750OpenShift Merge Robot2018-01-234-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1506750] Ensure proper hostname check override Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506750
| * | | | | | | | | | | | [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 nodes
| * | | | | | | | | | | | Add ability to mount volumes into system container nodesMichael Gugino2018-01-183-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to mount volumes into system containerized nodes. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534933
* | | | | | | | | | | | | Merge pull request #6812 from sdodson/bz1396350OpenShift Merge Robot2018-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure that node names are lowerecased before matching The name field is always lowercase whereas the nodename may not have been in the past. Ensure that we lowercase it before looking for matching nodes. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
| * | | | | | | | | | | | Ensure that node names are lowerecased before matchingScott Dodson2018-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name field is always lowercase whereas the nodename may not have been in the past. Ensure that we lowercase it before looking for matching nodes. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
* | | | | | | | | | | | | Merge pull request #6504 from mbruzek/mbruzek-openshift-openstackRussell Teague2018-01-231-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provision_install file ends in yml not yaml! Ansible requirement …
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mbruzek-openshift-openstackMatt Bruzek2018-01-18643-4016/+13638
| |\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 17:42:04 +0000