Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4407 from gnufied/fix-default-storage-class-key | Scott Dodson | 2017-06-12 | 1 | -1/+1 |
|\ | | | | | Change default key for gce | ||||
| * | Change default key for gce | Hemant Kumar | 2017-06-11 | 1 | -1/+1 |
| | | | | | | | | The usual convention is to use gce not gcp | ||||
* | | Merge pull request #4391 from mtnbikenc/1456096 | OpenShift Bot | 2017-06-12 | 4 | -0/+36 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Correct master-config update during upgrade | Russell Teague | 2017-06-08 | 4 | -0/+36 |
| | | | |||||
* | | | Merge pull request #4401 from ingvagabund/embedded-etcd-set-correct-etcd-path | Jan Chaloupka | 2017-06-12 | 3 | -3/+5 |
|\ \ \ | | | | | | | | | set etcd working directory for embedded etcd | ||||
| * | | | set etcd working directory for embedded etcd | Jan Chaloupka | 2017-06-10 | 3 | -3/+5 |
| | | | | |||||
* | | | | Automatic commit of package [openshift-ansible] release [3.6.99-1]. | Jenkins CD Merge Bot | 2017-06-12 | 2 | -2/+18 |
| |_|/ |/| | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.105 | ||||
* | | | Merge pull request #4400 from ingvagabund/replace-repoquery-with-module | Jan Chaloupka | 2017-06-10 | 1 | -9/+11 |
|\ \ \ | | | | | | | | | replace repoquery with module | ||||
| * | | | Replace repoquery with module | Jan Chaloupka | 2017-06-09 | 1 | -9/+11 |
| |/ / | |||||
* | | | Merge pull request #4382 from jarrpa/oc_secret-force | OpenShift Bot | 2017-06-09 | 3 | -10/+19 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | oc_secret: allow use of force for secret type | Jose A. Rivera | 2017-06-07 | 3 | -10/+19 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | Merge pull request #4262 from gnufied/default-storage-class | OpenShift Bot | 2017-06-09 | 6 | -0/+90 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Add dependency and use same storageclass name as upstream | Hemant Kumar | 2017-05-25 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | Add documentation | Hemant Kumar | 2017-05-23 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Install default storageclass in AWS & GCE envs | Hemant Kumar | 2017-05-22 | 6 | -0/+86 |
| | | | | | |||||
* | | | | | Merge pull request #3787 from juanvallejo/jvallejo/docker-storage-check | OpenShift Bot | 2017-06-09 | 5 | -29/+468 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Consider previous value of 'changed' when updating | Rodolfo Carvalho | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This avoids unintentionally overriding the value from `True` to `False`. | ||||
| * | | | | | Improve code readability | Rodolfo Carvalho | 2017-06-09 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | docker checks: finish and refactor | Luke Meyer | 2017-06-07 | 7 | -444/+397 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporated docker_storage_driver into docker_storage as both need driver info. Corrected storage calculation to include VG free space, not just the current amount in the LV pool. Now makes no assumptions about pool name. Improved user messaging. Factored out some methods that can be shared with docker_image_availability. | ||||
| * | | | | | add docker storage, docker driver checks | juanvallejo | 2017-06-01 | 4 | -0/+484 |
| | | | | | | |||||
* | | | | | | Merge pull request #4399 from ingvagabund/fail-if-node-upgrade-run-over-master | OpenShift Bot | 2017-06-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Disable excluder only on nodes that are not masters | Jan Chaloupka | 2017-06-09 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4398 from jschulthess/master | Scott Dodson | 2017-06-09 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Added includes to specify openshift version for libvirt cluster creat… | ||||
| * | | | | | | Added includes to specify openshift version for libvirt cluster create. ↵ | Jürg Schulthess | 2017-06-09 | 1 | -0/+2 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Otherwise bin/cluster create fails on unknown version for libvirt deployment. | ||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.98-1]. | Jenkins CD Merge Bot | 2017-06-09 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.102 | ||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.97-1]. | Scott Dodson | 2017-06-09 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version | ||||
* | | | | | | Merge pull request #4387 from ewolinetz/logging_oauth_idempot | OpenShift Bot | 2017-06-08 | 2 | -18/+44 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Updated to using oo_random_word for secret gen | ewolinetz | 2017-06-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Updating kibana to store session and oauth secrets for reuse, fix ↵ | ewolinetz | 2017-06-08 | 2 | -18/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | oauthclient generation for ops | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.5-1]. | Jenkins CD Merge Bot | 2017-06-08 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.101 | ||||
* | | | | | | | Merge pull request #4330 from codificat/20170531-image-rename | OpenShift Bot | 2017-06-08 | 10 | -24/+32 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Rename container image to origin-ansible / ose-ansible | Pep Turró Mauri | 2017-06-02 | 10 | -24/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #4279 the container image is being renamed to openshift/origin-ansible (upstream) and openshift3/ose-ansible (downstream) for the "oc cluster up" use case, and more generally to make it fit the imageConfig.format configuration option. This updates references to the image name accordingly. Also updating references to playbook2image to account for recent moves of the repo/image. | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.4-1]. | Jenkins CD Merge Bot | 2017-06-08 | 2 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.100 | ||||
* | | | | | | | Merge pull request #4384 from admiyo/guard-container | OpenShift Bot | 2017-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Guard check for container install based on openshift dictionary key | Adam Young | 2017-06-07 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #4375 from ↵ | OpenShift Bot | 2017-06-07 | 1 | -16/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abutcher/supported-registry-object-storage-providers Merged by openshift-bot | ||||
| * | | | | | | | Remove supported/implemented barrier for registry object storage providers. | Andrew Butcher | 2017-06-06 | 1 | -16/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4279 from jcantrill/use_oc_adm_lib | OpenShift Bot | 2017-06-07 | 6 | -5/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | fix up openshift-ansible for use with 'oc cluster up' | Jeff Cantrill | 2017-06-06 | 6 | -5/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #4351 from ewolinetz/logging_es_readiness_probe | OpenShift Bot | 2017-06-07 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | Updating probe timeout and exposing variable to adjust timeout in image | ewolinetz | 2017-06-01 | 1 | -2/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4370 from ashcrow/rename-daemon-json | OpenShift Bot | 2017-06-07 | 2 | -5/+7 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | rename daemon.json to container-daemon.json | Steve Milner | 2017-06-05 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The container-engine build has moved daemon.json to container-daemon.json to avoid collision. This change updates the template file location to follow suit. | ||||
* | | | | | | | | | Merge pull request #4371 from ashcrow/1455843-again | OpenShift Bot | 2017-06-07 | 3 | -0/+17 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | Add node unit file on upgrade | Steve Milner | 2017-06-06 | 3 | -0/+17 |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rpm_upgrade is used for upgrading the node's unit file will be overridden. systemd is then reloaded if the files are templated successfully. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1455843 | ||||
* | | | | | | | | | Merge pull request #4374 from jcantrill/specify_empty_index_mapping | Scott Dodson | 2017-06-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | specify all logging index mappings for kibana | ||||
| * | | | | | | | | | specify all logging index mappings for kibana | Jeff Cantrill | 2017-06-06 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4349 from sdodson/bz1392519 | Scott Dodson | 2017-06-07 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Do not attempt to override openstack nodename | ||||
| * | | | | | | | | | Do not attempt to override openstack nodename | Jason DeTiberus | 2017-06-01 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1392519 | ||||
* | | | | | | | | | | Merge pull request #4331 from stevekuznetsov/skuznets/update-is | Scott Dodson | 2017-06-07 | 2 | -8/+40 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update image stream to openshift/origin:2c55ade |