summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix es routes for new logging rolesRich Megginson2017-06-074-0/+129
| | | | | | | | | | | | port the code that creates the external Elasticsearch routes to the new logging roles Have to suppress this error message: SSL Problem illegal change cipher spec msg, conn state = 6, handshake state = 1 which is coming from the router health check, until https://github.com/openshift/origin/issues/14515 is fixed - otherwise, the es log is spammed relentlessly
* 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
| * | | | | | | | | | mux uses fluentd cert/key to talk to ESRich Megginson2017-05-311-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4267 from ozdanborne/byo-etcdOpenShift Bot2017-06-057-23/+52
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Support byo etcd for calicoDan Osborne2017-05-247-23/+52
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4064 from juanvallejo/jvallejo/add-ovs-version-checkOpenShift Bot2017-06-0511-98/+376
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | | preflight int tests: fix for package_version changesLuke Meyer2017-05-247-6/+42
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove unnecessary comment.Rodolfo Carvalho2017-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capturing the ImportError is a common idiom in Ansible modules, and it is not specific to tox.
| * | | | | | | | | | | | update aos_version module to support generic pkgs and versionsjuanvallejo2017-05-244-91/+333
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4157 from ↵OpenShift Bot2017-06-054-0/+376
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | juanvallejo/jvallejo/add-retroactive-ovs-version-check Merged by openshift-bot
| * | | | | | | | | | | | add existing_ovs_version checkjuanvallejo2017-05-195-0/+377
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4336 from sdodson/BZ1457062OpenShift Bot2017-06-052-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | | Add mtu setting to /etc/sysconfig/docker-networkScott Dodson2017-06-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1457062
* | | | | | | | | | | | | Merge pull request #4357 from ewolinetz/registry_console_imageScott Dodson2017-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | Updating image for registry_console
| * | | | | | | | | | | | Updating image for registry_consoleewolinetz2017-06-021-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4360 from abutcher/expired-ca-skip-restartsScott Dodson2017-06-021-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip service restarts within ca redeployment playbook when expired certificates are detected.
| * | | | | | | | | | | | | Skip service restarts within ca redeployment playbook when expired ↵Andrew Butcher2017-06-011-0/+37
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certificates are detected.
* | | | | | | | | | | | | Merge pull request #4321 from ingvagabund/verify-targets-separatellyOpenShift Bot2017-06-0214-79/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot