summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7060 from mwoodson/masterOpenShift Merge Robot2018-02-081-1/+14
|\ | | | | | | | | Automatic merge from submit-queue. aws ami: make it so the tags from the orinal AMI are used with the newly created AMI
| * aws ami: make it so the tags from the orinal AMI are used with the newly ↵Matt Woodson2018-02-071-1/+14
| | | | | | | | created AMI
* | Merge pull request #7057 from ashcrow/remove-master-from-ami-node-bootstrapKenny Woodson2018-02-082-3/+3
|\ \ | | | | | | openshift_node: Remove master from aws node building
| * | openshift_node: Remove master from aws node buildingSteve Milner2018-02-072-3/+3
| | | | | | | | | | | | | | | | | | | | | Since it is expected to be re-added at some point in the future the lines have been commented out rather than deleted. Signed-off-by: Steve Milner <smilner@redhat.com>
* | | Merge pull request #7043 from vrutkovs/prerequisites-enable-docker-excluderOpenShift Merge Robot2018-02-081-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Setup docker excluder if requested before container_runtime is installed That would prevent possible container runtime upgrades during cluster config Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540800 Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
| * | | Setup docker excluder if requested before container_runtime is installedVadim Rutkovsky2018-02-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That would prevent possible container runtime upgrades during cluster config Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | Merge pull request #7063 from sdodson/wc39Scott Dodson2018-02-071-1/+1
|\ \ \ \ | | | | | | | | | | Use v3.9 web-console image for now
| * | | | Use v3.9 web-console image for nowScott Dodson2018-02-071-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #6938 from vshn/revert-heketi-image-optionOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Revert "GlusterFS: Remove image option from heketi command" This reverts commit 3d3853836d71c37a9c81aea8e606c94052439789 which was supposedly a fix for an issue with topology initialization, but that turned out to be a separate issue fixed in commit b8879b5c6731bd51e590b470b1a51fce73db0ee1. By default "heketi-cli setup-openshift-heketi-storage" uses the "heketi/heketi:dev" image while, for OpenShift Container Platform installations, the default image for all other operations is "rhgs3/rhgs-volmanager-rhel7". In environments where only a limited set of Docker registries is available, i.e. only the Red Hat registry but not Docker Hub, using "heketi/heketi:dev" does not work or would require manual intervention. The discussion surrounding the removal of "--image" in PR#5769 involved statements that "--image" was removed from Heketi. As of January 30, 2018 the master branch contains the option, as does the upstream Docker image (Heketi version v5.0.0-225-gffb9fea) and the aforementioned "rhgs3/rhgs-volmanager-rhel7" image. Tested with OpenShift Container Platform 3.7.23.
| * | | | Revert "GlusterFS: Remove image option from heketi command"Michael Hanselmann2018-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3d3853836d71c37a9c81aea8e606c94052439789 which was supposedly a fix for an issue with topology initialization, but that turned out to be a separate issue fixed in commit b8879b5c6731bd51e590b470b1a51fce73db0ee1. By default "heketi-cli setup-openshift-heketi-storage" uses the "heketi/heketi:dev" image while, for OpenShift Container Platform installations, the default image for all other operations is "rhgs3/rhgs-volmanager-rhel7". In environments where only a limited set of Docker registries is available, i.e. only the Red Hat registry but not Docker Hub, using "heketi/heketi:dev" does not work or would require manual intervention. The discussion surrounding the removal of "--image" in PR#5769 involved statements that "--image" was removed from Heketi. As of January 30, 2018 the master branch contains the option, as does the upstream Docker image (Heketi version v5.0.0-225-gffb9fea) and the aforementioned "rhgs3/rhgs-volmanager-rhel7" image. Tested with OpenShift Container Platform 3.7.23.
* | | | | Merge pull request #7017 from mtnbikenc/fix-1540537OpenShift Merge Robot2018-02-076-2/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [1540537] Add base package installation to upgrade playbooks Hosts will need python ipaddress module installed if it was not installed during initial installation. Bug 1540537 https://bugzilla.redhat.com/show_bug.cgi?id=1540537
| * | | | Add base package installation to upgrade playbooksRussell Teague2018-02-076-2/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Hosts will need python ipaddress module installed if it was not installed during initial installation. Bug 1540537 https://bugzilla.redhat.com/show_bug.cgi?id=1540537
* | | | Merge pull request #7032 from spadgett/console-livenessScott Dodson2018-02-072-11/+11
|\ \ \ \ | | | | | | | | | | Detect config changes in console liveness probe
| * | | | Detect config changes in console liveness probeSamuel Padgett2018-02-062-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Use an md5sum to check if the console config has changed and automatically restart the container.
* | | | | Merge pull request #7044 from zgalor/fix_uninstall_bugOpenShift Merge Robot2018-02-072-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix uninstall using openshift_prometheus_state=absent This was broken in https://github.com/openshift/openshift-ansible/pull/6811 bz: https://bugzilla.redhat.com/show_bug.cgi?id=1540806
| * | | | Fix uninstall using openshift_prometheus_state=absentZohar Galor2018-02-072-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | This was broken in https://github.com/openshift/openshift-ansible/pull/6811 bz: https://bugzilla.redhat.com/show_bug.cgi?id=1540806
* | | | Merge pull request #7052 from vrutkovs/rolling_restart_modeOpenShift Merge Robot2018-02-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. 3.9 upgrade: fix typos in restart masters procedure * 'rolling_restart_mode' should be 'services', not 'service' * use 'state: restarted' to properly restart services Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540054 Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
| * | | | 3.9 upgrade: fix typos in restart masters procedureVadim Rutkovsky2018-02-071-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 'rolling_restart_mode' should be 'services', not 'service' * use 'state: restarted' to properly restart services Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
* | | | Merge pull request #7007 from abutcher/master-cert-idempotenceScott Dodson2018-02-071-17/+8
|\ \ \ \ | | | | | | | | | | Correct master certificates list checked by openshift_master_certificates
| * | | | Correct the list of certificates checked in openshift_master_certificates ↵Andrew Butcher2018-02-051-17/+8
| | | | | | | | | | | | | | | | | | | | s.t. masters do not incorrectly report that master certs are missing.
* | | | | Merge pull request #7045 from vrutkovs/quick-installer-new-playbook-pathsOpenShift Merge Robot2018-02-073-35/+108
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Quick installer: run prerequistes first and update path to main playbook Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542895
| * | | | | quick installer: disable broken test_get_hosts_to_run_on6 testVadim Rutkovsky2018-02-071-13/+12
| | | | | |
| * | | | | Quick installer: run prerequistes first and update path to main playbookVadim Rutkovsky2018-02-073-25/+99
| | |/ / / | |/| | |
* | | | | Merge pull request #7004 from cooktheryan/master-tag-fixOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. tag fix without ose- incorrect tag when trying to deploy efs
| * | | | | tag fix without ose-Ryan Cook2018-02-021-1/+1
| | |/ / / | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.41.0].Justin Pierce2018-02-072-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #7050 from jarrpa/gluster-doc-updateOpenShift Merge Robot2018-02-071-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. GlusterFS: Minor documentation update
| * | | | | GlusterFS: Minor documentation updateJose A. Rivera2018-02-071-11/+11
| | | | | |
* | | | | | Merge pull request #7040 from sdodson/bz1542399OpenShift Merge Robot2018-02-071-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Make sure to include upgrade_pre when upgrading master nodes Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542399
| * | | | | | Make sure to include upgrade_pre when upgrading master nodesScott Dodson2018-02-061-0/+3
| | | | | | |
* | | | | | | Merge pull request #7051 from sdodson/ovs27-ocp310Scott Dodson2018-02-072-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Allow OVS 2.7 in OCP 3.10
| * | | | | | Allow OVS 2.7 in OCP 3.10Scott Dodson2018-02-072-2/+2
|/ / / / / /
* | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.40.0].Justin Pierce2018-02-072-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #6993 from joelddiaz/deprovision_elbsKenny Woodson2018-02-077-29/+91
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | add deprovisioning for ELB (and IAM certs)
| * | | | | add deprovisioning for ELB (and IAM certs)Joel Diaz2018-02-027-29/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add playbooks to handle deleting ELBs and any IAM certs that may have been created during provisioning. redo ELB creation to remove arbitrary wait and just retry until ELB creation succeeds
* | | | | | Merge pull request #6688 from jsanda/termination-grace-periodOpenShift Merge Robot2018-02-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. [6632] fix indentation of terminationGracePeriodSeconds var This is a PR to fix [6632](https://github.com/openshift/openshift-ansible/issues/6632).
| * | | | | | [6632] fix indentation of terminationGracePeriodSeconds varJohn Sanda2018-01-101-1/+1
| | | | | | |
* | | | | | | Merge pull request #7035 from sosiouxme/20180206-ovs-2.9OpenShift Merge Robot2018-02-063-9/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. health checks: tolerate ovs 2.9 fixes https://bugzilla.redhat.com/show_bug.cgi?id=1541313
| * | | | | | health checks: tolerate ovs 2.9Luke Meyer2018-02-063-9/+17
| | | | | | |
* | | | | | | Merge pull request #7015 from sdodson/v310Scott Dodson2018-02-06207-31/+96372
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Initial support for 3.10
| * | | | | | | Initial support for 3.10Scott Dodson2018-02-05207-31/+96372
| | | | | | | |
* | | | | | | | Merge pull request #7029 from mgugino-upstream-stage/fix-wordingScott Dodson2018-02-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix docker rpm upgrade install task wording
| * | | | | | | | Fix docker rpm upgrade install task wordingMichael Gugino2018-02-061-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This commit corrects wording of task name.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.39.0].Justin Pierce2018-02-062-2/+16
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #7020 from vrutkovs/node-config-on-upgradeScott Dodson2018-02-061-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Upgrades: pass openshift_manage_node_is_master to master nodes during upgrade
| * | | | | | | Upgrades: pass openshift_manage_node_is_master to master nodes during upgradeVadim Rutkovsky2018-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures required labels for master would be set
* | | | | | | | Merge pull request #7033 from kwoodson/shell_update_fixScott Dodson2018-02-061-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Update code to not fail when rc != 0
| * | | | | | | Update code to not fail when rc != 0Kenny Woodson2018-02-061-0/+3
|/ / / / / / /
* | | | | | | Merge pull request #6628 from ewolinetz/es_5.x_opt_inOpenShift Merge Robot2018-02-0654-121/+1726
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Es 5.x opt in FYI @richm @jcantrill
| * | | | | | | Swapping container order for es podEric Wolinetz2018-02-052-73/+73
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:18:03 +0000