summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4391 from mtnbikenc/1456096OpenShift Bot2017-06-124-0/+36
|\ | | | | Merged by openshift-bot
| * Correct master-config update during upgradeRussell Teague2017-06-084-0/+36
| |
* | Merge pull request #4401 from ingvagabund/embedded-etcd-set-correct-etcd-pathJan Chaloupka2017-06-123-3/+5
|\ \ | | | | | | set etcd working directory for embedded etcd
| * | set etcd working directory for embedded etcdJan Chaloupka2017-06-103-3/+5
| | |
* | | Automatic commit of package [openshift-ansible] release [3.6.99-1].Jenkins CD Merge Bot2017-06-122-2/+18
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.105
* | | Merge pull request #4400 from ingvagabund/replace-repoquery-with-moduleJan Chaloupka2017-06-101-9/+11
|\ \ \ | | | | | | | | replace repoquery with module
| * | | Replace repoquery with moduleJan Chaloupka2017-06-091-9/+11
| |/ /
* | | Merge pull request #4382 from jarrpa/oc_secret-forceOpenShift Bot2017-06-093-10/+19
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | oc_secret: allow use of force for secret typeJose A. Rivera2017-06-073-10/+19
| | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | Merge pull request #4262 from gnufied/default-storage-classOpenShift Bot2017-06-096-0/+90
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Add dependency and use same storageclass name as upstreamHemant Kumar2017-05-252-2/+4
| | | | |
| * | | | Add documentationHemant Kumar2017-05-231-0/+2
| | | | |
| * | | | Install default storageclass in AWS & GCE envsHemant Kumar2017-05-226-0/+86
| | | | |
* | | | | Merge pull request #3787 from juanvallejo/jvallejo/docker-storage-checkOpenShift Bot2017-06-095-29/+468
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Consider previous value of 'changed' when updatingRodolfo Carvalho2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | This avoids unintentionally overriding the value from `True` to `False`.
| * | | | | Improve code readabilityRodolfo Carvalho2017-06-091-1/+3
| | | | | |
| * | | | | docker checks: finish and refactorLuke Meyer2017-06-077-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 checksjuanvallejo2017-06-014-0/+484
| | | | | |
* | | | | | Merge pull request #4399 from ingvagabund/fail-if-node-upgrade-run-over-masterOpenShift Bot2017-06-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Disable excluder only on nodes that are not mastersJan Chaloupka2017-06-091-1/+1
| | | | | | |
* | | | | | | Merge pull request #4398 from jschulthess/masterScott Dodson2017-06-091-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Added includes to specify openshift version for libvirt cluster creat…
| * | | | | | Added includes to specify openshift version for libvirt cluster create. ↵Jürg Schulthess2017-06-091-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 Bot2017-06-092-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 Dodson2017-06-092-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version
* | | | | | Merge pull request #4387 from ewolinetz/logging_oauth_idempotOpenShift Bot2017-06-082-18/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Updated to using oo_random_word for secret genewolinetz2017-06-081-2/+2
| | | | | | |
| * | | | | | Updating kibana to store session and oauth secrets for reuse, fix ↵ewolinetz2017-06-082-18/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | oauthclient generation for ops
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.5-1].Jenkins CD Merge Bot2017-06-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.101
* | | | | | | Merge pull request #4330 from codificat/20170531-image-renameOpenShift Bot2017-06-0810-24/+32
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Merged by openshift-bot
| * | | | | | Rename container image to origin-ansible / ose-ansiblePep Turró Mauri2017-06-0210-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 Bot2017-06-082-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.100
* | | | | | | Merge pull request #4384 from admiyo/guard-containerOpenShift Bot2017-06-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Guard check for container install based on openshift dictionary keyAdam Young2017-06-071-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #4375 from ↵OpenShift Bot2017-06-071-16/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abutcher/supported-registry-object-storage-providers Merged by openshift-bot
| * | | | | | | Remove supported/implemented barrier for registry object storage providers.Andrew Butcher2017-06-061-16/+0
| | | | | | | |
* | | | | | | | Merge pull request #4279 from jcantrill/use_oc_adm_libOpenShift Bot2017-06-076-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | fix up openshift-ansible for use with 'oc cluster up'Jeff Cantrill2017-06-066-5/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #4351 from ewolinetz/logging_es_readiness_probeOpenShift Bot2017-06-071-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Updating probe timeout and exposing variable to adjust timeout in imageewolinetz2017-06-011-2/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #4370 from ashcrow/rename-daemon-jsonOpenShift Bot2017-06-072-5/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | rename daemon.json to container-daemon.jsonSteve Milner2017-06-052-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-againOpenShift Bot2017-06-073-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Add node unit file on upgradeSteve Milner2017-06-063-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_mappingScott Dodson2017-06-071-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | specify all logging index mappings for kibana
| * | | | | | | | | specify all logging index mappings for kibanaJeff Cantrill2017-06-061-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4349 from sdodson/bz1392519Scott Dodson2017-06-071-5/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Do not attempt to override openstack nodename
| * | | | | | | | | Do not attempt to override openstack nodenameJason DeTiberus2017-06-011-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1392519
* | | | | | | | | | Merge pull request #4331 from stevekuznetsov/skuznets/update-isScott Dodson2017-06-072-8/+40
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update image stream to openshift/origin:2c55ade
| * | | | | | | | | | Update image stream to openshift/origin:2c55adeSteve Kuznetsov2017-05-312-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* | | | | | | | | | | Merge pull request #4376 from abutcher/uninstall-client-configScott Dodson2017-06-071-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Separate client config removal in uninstall s.t. ansible_ssh_user is removed from with_items.