summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | | | Separate client config removal in uninstall s.t. ansible_ssh_user is removed ↵Andrew Butcher2017-06-061-2/+10
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | from with_items.
* | | | | | | | | Merge pull request #4369 from giuseppe/fix-etcd-system-containerOpenShift Bot2017-06-071-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | openshift-master: set r_etcd_common_etcd_runtimeGiuseppe Scrivano2017-06-061-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.3-1].Jenkins CD Merge Bot2017-06-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.99
* | | | | | | | | Merge pull request #4278 from abutcher/loopback-kubeconfigOpenShift Bot2017-06-073-3/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Use local openshift.master.loopback_url when generating initial master ↵Andrew Butcher2017-06-023-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loopback kubeconfigs.
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.2-1].Jenkins CD Merge Bot2017-06-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.98
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.89.1-1].Jenkins CD Merge Bot2017-06-062-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog 3.6.97
* | | | | | | | | Merge pull request #4252 from sdodson/tolerate-node-upgrade-failureOpenShift Bot2017-06-064-3/+61
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Add separate variables for control plane nodesScott Dodson2017-05-223-4/+12
| | | | | | | | |
| * | | | | | | | Tolerate failures in the node upgrade playbookScott Dodson2017-05-194-2/+52
| | | | | | | | |
* | | | | | | | | Merge pull request #4327 from ewolinetz/fix_logging_secretOpenShift Bot2017-06-063-6/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra ↵ewolinetz2017-05-313-6/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ES dc creation
* | | | | | | | | Merge pull request #3643 from juanvallejo/jvallejo/elastic-search-checkOpenShift Bot2017-06-0613-6/+1575
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | add elasticseatch, fluentd, kibana checkjuanvallejo2017-06-0213-6/+1575
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4348 from tbielawa/bz1451693OpenShift Bot2017-06-052-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Add daemon_reload parameter to service tasksTim Bielawa2017-06-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "Could not find the requested service atomic-openshift-master: cannot enable" error during reinstall. https://bugzilla.redhat.com/show_bug.cgi?id=1451693
* | | | | | | | | | | Merge pull request #4342 from richm/mux-uses-fluentd-secretOpenShift Bot2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot