summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-27Fix typo in drop_etcdctl.ymlMichael Hanselmann
s/alises/aliases/ says everything.
2017-09-27Added new variables for logging role for remote-syslog pluginstran
Includes the following code review fixes, and a rebase with upstream/master - mux.j2 template needed mux specific parameters for syslog configs - fixed bug in IF condition not checking for true-ness - updated README wording to remove ambiguity of payload_key's datatype
2017-09-27Rename filter_plugins to unique namesRussell Teague
Filter plugin modules should have unique names to not conflict with core Ansible modules. (Ansible 2.4)
2017-09-27Merge pull request #5546 from ewolinetz/bz1495203OpenShift Merge Robot
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
2017-09-27Merge pull request #5553 from mgugino-upstream-stage/provisioning-typosKenny Woodson
Fix missing quotes on openshift_aws_build_ami_ssh_user default
2017-09-27Fix missing quotes on openshift_aws_build_ami_ssh_user defaultMichael Gugino
2017-09-27papr: Workaround for RHBZ#1483553Steve Milner
Work originally done by @jlebon plus a bump up in RAM.
2017-09-27Merge pull request #4973 from wozniakjan/logging_eventrouterOpenShift Merge Robot
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
2017-09-27Merge pull request #5532 from mgugino-upstream-stage/centos-ami-provisionScott Dodson
More variables in AWS provisioning plays
2017-09-27evaluate etcd_backup_tag variableJan Chaloupka
2017-09-27Merge pull request #5533 from mgugino-upstream-stage/configure-network-managerOpenShift Merge Robot
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.
2017-09-27docker: fix some tox warningsGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27Require openshift_image_tag in the inventory with openshift-enterpriseGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27crio: use the image_tag on RHELGiuseppe Scrivano
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-27docker: use the image_tag on RHELGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-26Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memoryOpenShift Merge Robot
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
2017-09-27Automatic commit of package [openshift-ansible] release [3.7.0-0.132.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5470 from ingvagabund/consolidate-etcd-common-roleOpenShift Merge Robot
Automatic merge from submit-queue Consolidate etcd common role The last PR toward a single etcd role
2017-09-26Merge pull request #5536 from ingvagabund/make-difference-output-list-3.7OpenShift Merge Robot
Automatic merge from submit-queue make difference filter output a list for Python3 Fixes: #3934
2017-09-26Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot
Automatic merge from submit-queue Fluentd: one output tag, one output plugin (origin-aggregated-logging)
2017-09-26Adding default for volume size if not setEric Wolinetz
2017-09-26Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot
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
2017-09-26Remove some reminants of Atomic EnterpriseScott Dodson
2017-09-26Removing setting pvc size and dynamic to remove looped var settingEric Wolinetz
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.131.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot
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.
2017-09-26Fix origin repo deploymentMichael Gugino
Currently, origin deployments place a repo on nodes and masters named centos-openshift-origin. At some point, the maintainers of centos-openshift-origin migrated previous releases of openshift to their own respective repositories. This commit provides the correct repositories for centos-openshift-origin based on the variable openshift_release, defaulting to the latest release reposititory (unversioned). Fixes: https://github.com/openshift/openshift-ansible/issues/5404
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.130.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot
Automatic merge from submit-queue Passing in image parameter for tsb template CC @jim-minter @deads2k @bparees
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.129.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot
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.
2017-09-26Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot
Automatic merge from submit-queue Remove logging ES_COPY feature This PR removes the ES_COPY feature that has been deprecated since 3.3
2017-09-26make difference filter output a list for Python3Jan Chaloupka
2017-09-26More variables in AWS provisioning playsMichael Gugino
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.
2017-09-26Support installation of NetworkManager for provisioned nodesMichael Gugino
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.
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.128.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Fix public master cluster DNS record when using bastion (#752)Bogdan Dobrelya
When using a bastion and a single master, add the bastion node's public IP the public master's IP for the DNS record. Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2017-09-26Upscaling OpenShift application nodes (#571)Tlacenka
* scale-up: playbook for upscaling app nodes * scale-up: removed debug * scale-up: made suggested changes * scale-up: indentation fix * upscaling: process split into two playbooks that are executed by a bash script - upscaling_run.sh: bash script, usage displayed using -h parameter - upscaling_pre-tasks: check that new value is higher, change inventory variable - upscaling_scale-up: rerun provisioning and installation, verify change * upscaling_run: fixed openshift-ansible-contrib directory name * upscaling_run: inventory can be entered as relative path * upscaling_scale-up: fixed formatting * upscaling: minor changes * upscaling: moved to .../provisioning/openstack directory, README updated, minor changes made * README: minor changes * README: formatting * uspcaling: minor fix * upscaling: fix * upscaling: added customisations, fixes - openshift-ansible-contrib and openshift-ansible paths are customisable - fixed implicit incrementation by 1 * upscaling: fixes * upscaling: fixes * upscaling: another fix * upscaling: another fix * upscaling: fix * upscaling: back to a single playbook, README updated * minor fix * pre_tasks: added labels for autoscaling * scale-up: fixes * scale-up: fixed host variables, post-verification is only based on labels * scale-up: added openshift-ansible path customisation - path has to be absolute, cannot contain '/' at the end * scale-up: fix * scale-up: debug removed * README: added docs on openshift_ansible_dir, note about bastion * static_inventory: newly added nodes are added to new_nodes group - note: re-running provisioning fails when trying to install docker * removing new line * scale-up: running byo/config.yml or scaleup.yml based on the situation - (whether there is an existing deployment or not) * openstack.yml: indentation fix * added refresh inventory * upscaling: new_nodes only contains new does, it is not used during the first deployment * static_inventory: make sure that new nodes end up only in their new_nodes group * bug fixes * another fix * fixed condition * scale-up, static_inventory role: all app node data gathered before provisioning * upscaling: bug fixes * upscaling: another fixes * fixes * upscaling: fix * upscaling: fix * upscaling: another logic fix * bug fix for non-scaling deployments
2017-09-26Set the etcd backend quota to 4GB by defaultJan Chaloupka
2017-09-26Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot
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
2017-09-26logging: introducing event routerJan Wozniak
- 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
2017-09-25Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz
2017-09-25Merge pull request #5520 from ingvagabund/check-etcd-storage-backendOpenShift Merge Robot
Automatic merge from submit-queue check if the storage backend is set to etcd3 before upgrading to 3.7 SSIA
2017-09-25Generate aggregator api client config in temporary directory.Andrew Butcher
2017-09-25Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot
Automatic merge from submit-queue Changes for Nuage atomic ansible install
2017-09-25consolidate etcd_common roleJan Chaloupka
2017-09-25Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot
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
2017-09-25Rhv 3.6 disks (#756)Chandler Wilkerson
* Clean up cluster definition * Changed disk sizes for 3.6
2017-09-25Passing in image parameter for tsb templateEric Wolinetz
2017-09-25Fluentd: one output tag, one output pluginNoriko Hosoi
Adding <label @OUTPUT> to fluent.conf.