summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in drop_etcdctl.ymlMichael Hanselmann2017-09-271-1/+1
| | | | s/alises/aliases/ says everything.
* Merge pull request #5546 from ewolinetz/bz1495203OpenShift Merge Robot2017-09-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Adding default for volume size if not set Adds default for volume size if not provided but setting the storage kind Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1495203 https://github.com/openshift/openshift-ansible/issues/5525 This should go in after https://github.com/openshift/openshift-ansible/pull/5543
| * Adding default for volume size if not setEric Wolinetz2017-09-261-2/+2
| |
* | Merge pull request #5553 from mgugino-upstream-stage/provisioning-typosKenny Woodson2017-09-271-1/+1
|\ \ | | | | | | Fix missing quotes on openshift_aws_build_ami_ssh_user default
| * | Fix missing quotes on openshift_aws_build_ami_ssh_user defaultMichael Gugino2017-09-271-1/+1
|/ /
* | Merge pull request #4973 from wozniakjan/logging_eventrouterOpenShift Merge Robot2017-09-2712-2/+374
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue logging: introducing event router Initial concept integrating kubernetes events to EFK stack using [eventrouter](https://github.com/heptio/eventrouter) - **eventrouter** is deployed to logging project, has a service account and its own role to read events - **eventrouter** watches kubernetes events, marshalls them to JSON and outputs to its STDOUT - **fluentd** picks them up and inserts to elastic search logging project index Kubernetes events could be easily stored into different index. Among other ways, it could be achieved either by a fluentd filter plugin or custom eventrouter sink. Pending actions: - [x] - get our downstream and upstream images for eventrouter, don't use heptio's cc: @josefkarasek , @jcantrill , @richm
| * | logging: introducing event routerJan Wozniak2017-09-2612-2/+374
| | | | | | | | | | | | | | | | | | | | | | | | - eventrouter has its own role 'openshift_logging_eventrouter' written as a template - 'openshift_logging_install_eventrouter' controls whether it gets included in the playbook or not - deployed by default to 'default' namespace
* | | Merge pull request #5532 from mgugino-upstream-stage/centos-ami-provisionScott Dodson2017-09-273-2/+6
|\ \ \ | | | | | | | | More variables in AWS provisioning plays
| * | | More variables in AWS provisioning playsMichael Gugino2017-09-263-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds more optional variables to provision hosts in AWS environments. These changes allow provisioning instances that utilize an ssh_user other than root.
* | | | Merge pull request #5533 from mgugino-upstream-stage/configure-network-managerOpenShift Merge Robot2017-09-272-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Support installation of NetworkManager for provisioned nodes Currently, automated AWS provisionging fails when provisioning with images that don't already have NetworkManager installed and activated. This commit adds NetworkManager to the build_ami provisioning process, if not already installed.
| * | | | Support installation of NetworkManager for provisioned nodesMichael Gugino2017-09-262-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, automated AWS provisionging fails when provisioning with images that don't already have NetworkManager installed and activated. This commit adds NetworkManager to the build_ami provisioning process, if not already installed.
* | | | | Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memoryOpenShift Merge Robot2017-09-261-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue logging: fix kibana and kibana-ops defaults - move kibana-ops defaults to `openshift_logging_kibana` role - set kibana-ops memory limit to 256Mi to match kibana memory limit **additional steps:** - [ ] backport to 3.6 - [ ] backport to 3.5 - [x] wait for PR #5176 to merge and rebase cc: @jcantrill
| * | | | | logging: fix kibana and kibana-ops defaultsJan Wozniak2017-09-251-2/+2
| | |_|/ / | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.132.0].Jenkins CD Merge Bot2017-09-272-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5470 from ingvagabund/consolidate-etcd-common-roleOpenShift Merge Robot2017-09-2640-323/+272
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Consolidate etcd common role The last PR toward a single etcd role
| * | | | | consolidate etcd_common roleJan Chaloupka2017-09-2540-323/+272
| | | | | |
* | | | | | Merge pull request #5536 from ingvagabund/make-difference-output-list-3.7OpenShift Merge Robot2017-09-263-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue make difference filter output a list for Python3 Fixes: #3934
| * | | | | | make difference filter output a list for Python3Jan Chaloupka2017-09-263-5/+5
| | | | | | |
* | | | | | | Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot2017-09-262-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Fluentd: one output tag, one output plugin (origin-aggregated-logging)
| * | | | | | | Fluentd: one output tag, one output pluginNoriko Hosoi2017-09-252-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding <label @OUTPUT> to fluent.conf.
* | | | | | | | Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot2017-09-261-4/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Updating to check for netnamespace kube-service-catalog to be ready When we are using the sdn multitentant plugin we need to wait for the netnamespace to be ready before we can make it a global project Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1487959
| * | | | | | | Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz2017-09-251-4/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.131.0].Jenkins CD Merge Bot2017-09-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot2017-09-261-11/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Generate aggregator api client config in temporary directory. The `run_once`'s probably aren't necessary since the role is ran serially.
| * | | | | | | Generate aggregator api client config in temporary directory.Andrew Butcher2017-09-251-11/+29
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.130.0].Jenkins CD Merge Bot2017-09-262-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot2017-09-263-4/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Passing in image parameter for tsb template CC @jim-minter @deads2k @bparees
| * | | | | | | | Passing in image parameter for tsb templateEric Wolinetz2017-09-253-4/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.129.0].Jenkins CD Merge Bot2017-09-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot2017-09-2629-236/+239
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Refactor openshift_hosted plays and role (version 2) Currently, openshift_hosted role duplicates some logic across separate task chains. This commit cleans up the openshift_hosted role and converts it to be primarily used with include_role to give better logic to the playbooks that utilize this role. This commit also refactors the playbook that calls various openshift_hosted roles into individual playbooks. This allows more granularity for advanced users. ----- This version of the patch set rolls back some of the refactoring (removal of running fact roles as a dependency) and focuses on just realigning the roles and plays. Original PR: https://github.com/openshift/openshift-ansible/pull/5284 Once this merges, I will close the old PR. Leaving it open for now for reference.
| * | | | | | | | Refactor openshift_hosted plays and roleMichael Gugino2017-09-2529-236/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, openshift_hosted role duplicates some logic across separate task chains. This commit cleans up the openshift_hosted role and converts it to be primarily used with include_role to give better logic to the playbooks that utilize this role. This commit also refactors the playbook that calls various openshift_hosted roles into individual playbooks. This allows more granularity for advanced users.
* | | | | | | | | Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot2017-09-265-6/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Remove logging ES_COPY feature This PR removes the ES_COPY feature that has been deprecated since 3.3
| * | | | | | | | Remove logging ES_COPY featureJeff Cantrill2017-09-225-6/+3
| | | | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.128.0].Jenkins CD Merge Bot2017-09-262-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot2017-09-262-5/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Detect the proper version of the images when using CRI-O Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357
| * | | | | | | | crio: detect the correct version of the imagesGiuseppe Scrivano2017-09-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | | crio: set the correct image name with OSEGiuseppe Scrivano2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Merge pull request #5520 from ingvagabund/check-etcd-storage-backendOpenShift Merge Robot2017-09-252-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue check if the storage backend is set to etcd3 before upgrading to 3.7 SSIA
| * | | | | | | | check if the storage backend is set to etcd3 before upgrading to 3.7Jan Chaloupka2017-09-252-0/+26
| |/ / / / / / /
* | | | | | | | Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot2017-09-254-19/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Changes for Nuage atomic ansible install
| * | | | | | | Changes for Nuage atomic ansible installRohan Parulekar2017-09-204-19/+5
| | | | | | | |
* | | | | | | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot2017-09-255-11/+71
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Move additional/block/insecure registires to /etc/containers/... Move additional/block/insecure registires to /etc/containers/registries.conf This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
| * | | | | | | Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-215-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
* | | | | | | | Merge pull request #5415 from ttindell2/masterOpenShift Merge Robot2017-09-254-39/+48
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue #5362 GlusterFS fails to run more than once #5362 Added the ability to have the GlusterFS ansible script run more than once. It also allows to update the topology of the Gluster cluster even if the Gluster cluster has already been deployed. @dustymabe
| * | | | | | | GlusterFS can now be run more than once. Ability to add devices to nodesTim Tindell2017-09-184-39/+48
| | | | | | | |
* | | | | | | | Merge pull request #5451 from ingvagabund/consolidate-etcd-upgradeOpenShift Merge Robot2017-09-2513-64/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Consolidate etcd upgrade Consolidates `etcd_upgrade` into the `etcd` role.
| * | | | | | | consolidate etcd_upgrade roleJan Chaloupka2017-09-2113-64/+36
| | | | | | | |
* | | | | | | | Merge pull request #5492 from jsafrane/local-storage-predicateOpenShift Merge Robot2017-09-252-1/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Add 3.7 scheduler predicates In 3.7 we added NoVolumeNodeConflict and MaxAzureDiskVolumeCount predicate that needs to be installed. Check carefully, I tested it on my virtual machine, but I did not manage to run the test.
| * | | | | | | Add 3.7 scheduler predicatesJan Safranek2017-09-202-1/+32
| |/ / / / / /
* | | | | | | Merge pull request #5513 from lucastheisen/masterOpenShift Merge Robot2017-09-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue resolve #5428: python-dbus not found `python-dbus` is not available in centos standard repos, but: > It appears python-dbus is just a reference to dbus-python and `dbus-python` is.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:14:49 +0000