Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4380 from jarrpa/oc_obj-fixes | OpenShift Bot | 2017-06-13 | 2 | -4/+16 |
|\ | | | | | Merged by openshift-bot | ||||
| * | oc_obj: set _delete() rc to 0 if err is 'not found' | Jose A. Rivera | 2017-06-06 | 2 | -2/+12 |
| | | | | | | | | | | | | | | When deleting multiple objects, allow for some resources to already be absent. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | oc_obj: only check 'items' if exists in delete | Jose A. Rivera | 2017-06-06 | 2 | -2/+4 |
| | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | Merge pull request #4388 from giuseppe/etcd-container-to-system-container | OpenShift Bot | 2017-06-13 | 4 | -11/+84 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | certificates: copy the certificates for the etcd system container | Giuseppe Scrivano | 2017-06-10 | 2 | -9/+29 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | etcd: system container defines ETCD_(PEER_)?TRUSTED_CA_FILE | Giuseppe Scrivano | 2017-06-08 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | etcd: unmask system container service before installing it | Giuseppe Scrivano | 2017-06-08 | 1 | -0/+26 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | etcd: copy previous database when migrating to system container | Giuseppe Scrivano | 2017-06-08 | 1 | -0/+24 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
| * | | etcd: define data dir location for the system container | Giuseppe Scrivano | 2017-06-08 | 2 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | Merge pull request #4403 from abutcher/node-daemon-reload | OpenShift Bot | 2017-06-12 | 2 | -7/+21 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | Add daemon-reload handler to openshift_node and notify when /etc/systemd ↵ | Andrew Butcher | 2017-06-09 | 2 | -7/+21 |
| | | | | | | | | | | | | | | | | files have been updated. | ||||
* | | | | Merge pull request #4223 from hemmop/bug/storage-class-annotation | OpenShift Bot | 2017-06-12 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Use volume.beta.kubernetes.io annotation for storage-classes | Per Carlson | 2017-06-08 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | 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 #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 |
| | | | | | |||||
* | | | | | 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 | 5 | -0/+88 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 5 | -0/+84 |
| | | | | | | |||||
* | | | | | | 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 #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 | ||||
* | | | | | | 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 | 4 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | fix up openshift-ansible for use with 'oc cluster up' | Jeff Cantrill | 2017-06-06 | 4 | -4/+4 |
| |/ / / / / | |||||
* | | | | | | 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 | ||||
| * | | | | | | | Update image stream to openshift/origin:2c55ade | Steve Kuznetsov | 2017-05-31 | 2 | -8/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Kuznetsov <skuznets@redhat.com> | ||||
* | | | | | | | | Merge pull request #4278 from abutcher/loopback-kubeconfig | OpenShift Bot | 2017-06-07 | 3 | -3/+38 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | Use local openshift.master.loopback_url when generating initial master ↵ | Andrew Butcher | 2017-06-02 | 3 | -3/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loopback kubeconfigs. | ||||
* | | | | | | | | Merge pull request #4327 from ewolinetz/fix_logging_secret | OpenShift Bot | 2017-06-06 | 3 | -6/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merged by openshift-bot |