summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix registry auth variableMichael Gugino2017-09-292-2/+2
| | | | | | | | There is currently a bug in registry auth credential creation logic for openshift_node and openshift_node_upgrade This commit fixes the logic.
* Merge pull request #5594 from ↵Jan Chaloupka2017-09-295-28/+28
|\ | | | | | | | | ingvagabund/move-health-checks-and-ctrl-plane-ver-before-excluders move health-checks and control-plane-verification before excluders
| * move health-checks and control-plane-verification before excludersJan Chaloupka2017-09-295-28/+28
|/
* Merge pull request #5588 from IshentRas/fix-typoScott Dodson2017-09-292-2/+2
|\ | | | | Fix typo in files (Docker registries)
| * Fix typo in files (Docker registries)William Burton2017-09-292-2/+2
|/
* Merge pull request #5020 from jsanda/prometheus-endpoint-configOpenShift Merge Robot2017-09-293-0/+8
|\ | | | | | | | | | | | | Automatic merge from submit-queue. Prometheus endpoint config for hawkular-metrics and cassandra Prometheus endpoints are exposed in hawkular-metrics and in cassandra by default. This PR adds options to disable them.
| * rename vars to avoid double negatives and ensuing confusionJohn Sanda2017-08-143-6/+6
| |
| * set prometheus endpoint properties to false by defaultJohn Sanda2017-08-091-2/+2
| |
| * add options to disable prometheus endpointsJohn Sanda2017-07-243-0/+7
| | | | | | | | | | The prometheus endpoints for cassandra and for hawkular-metrics are enabled by default. This commit adds the option to disable them.
| * Enable JMX reporting of internal metricsJohn Sanda2017-07-071-0/+1
| | | | | | | | | | We need to enable jmx reporting of our internal, dropwizard metrics so that they can be exposed over prometheus endpoint.
* | Merge pull request #5544 from sdodson/aep-b-goneOpenShift Merge Robot2017-09-286-77/+8
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove some remnants of Atomic Enterprise Removes a few un-necessary uninstall steps
| * | Remove some reminants of Atomic EnterpriseScott Dodson2017-09-266-77/+8
| | |
* | | Merge pull request #5559 from mgugino-upstream-stage/readd-ent-registryOpenShift Merge Robot2017-09-289-57/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Migrate enterprise registry logic to docker role Currently, the enterprise registry to forcefully added in openshift_facts. Recently, the docker role has been modified to consume registry variables directly, bypassing openshift_facts. This commit cleans up unused code in openshift_facts, and migrates enterprise registry logic to the docker role. Fixes: https://github.com/openshift/openshift-ansible/issues/5557
| * | | Migrate enterprise registry logic to docker roleMichael Gugino2017-09-279-57/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the enterprise registry to forcefully added in openshift_facts. Recently, the docker role has been modified to consume registry variables directly, bypassing openshift_facts. This commit cleans up unused code in openshift_facts, and migrates enterprise registry logic to the docker role. Fixes: https://github.com/openshift/openshift-ansible/issues/5557
* | | | Merge pull request #5531 from sqtran/remote-syslog-configsOpenShift Merge Robot2017-09-283-0/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Added new variables for logging role for remote-syslog plugin This commit adds a few new parameters useful for the fluent-plugin-remote-syslog work. These won't be useful until https://github.com/openshift/origin-aggregated-logging/pull/679 is merged into the logging project first.
| * | | | minor update to README and removed dead filestran2017-09-272-215/+18
| | | | |
| * | | | Added new variables for logging role for remote-syslog pluginstran2017-09-274-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #5508 from sdodson/disable-image-streamsOpenShift Merge Robot2017-09-283-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Allow examples management to be disabled By setting openshift_install_examples=false the image stream and quick start templates will not be installed https://trello.com/c/zLaSgxig/436-2-customers-need-a-way-to-opt-out-of-openshift-ansible-template-and-imagestream-mangement Fixes #5061
| * | | | | Allow examples management to be disabledScott Dodson2017-09-223-3/+5
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.134.0].Jenkins CD Merge Bot2017-09-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5527 from mtnbikenc/installer-checkpointOpenShift Merge Robot2017-09-2821-65/+660
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Installer checkpointing This pull request adds an Ansible callback plugin to allow for 'checkpointing' the status of the OpenShift-Ansible installer. The installer is divided up into phases and each phase will start with a status of 'Not Started'. As the phase is performed the status will be updated to 'In Progress' and finally 'Complete'. Should the install fail or complete successfully, the callback plugin will report the status of all phases after the PLAY RECAP. The INSTALLER STATUS is also written to the Ansible log file. https://trello.com/c/VNEvT2Fo Changes: - Added installer_checkpoint role and callback plugin - Added checkpoint 'Start' and 'End' plays to each installation phase Additional items related to enabling proper checkpointing: - Removed openshift_set_hostname and related task (related to 3.0) - Added openshift-hosted entry point playbook - Moved openshift metrics and logging out of openshift_hosted playbook - Moved API Aggregation play to master install Example playbook output: ``` <- snip -> PLAY RECAP *********************************************************************************************************************************** ec2-34-207-180-218.compute-1.amazonaws.com : ok=158 changed=16 unreachable=0 failed=0 ec2-52-87-169-12.compute-1.amazonaws.com : ok=469 changed=74 unreachable=0 failed=0 ec2-52-90-209-20.compute-1.amazonaws.com : ok=157 changed=17 unreachable=0 failed=0 localhost : ok=24 changed=0 unreachable=0 failed=0 INSTALLER STATUS ***************************************************************************************************************************** Initialization : Complete etcd Install : Complete NFS Install : Not Started Load balancer Install : Not Started Master Install : Complete Master Additional Install : Complete Node Install : Complete GlusterFS Install : Not Started Hosted Install : Complete Metrics Install : Not Started Logging Install : Not Started Service Catalog Install : Not Started ```
| * | | | | | OpenShift-Ansible Installer CheckpointingRussell Teague2017-09-2721-65/+660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added installer_checkpoint role and callback plugin - Added checkpoint 'Start' and 'End' plays to each installation phase Additional items related to enabling proper checkpointing: - Removed openshift_set_hostname and related task (related to 3.0) - Added openshift-hosted entry point playbook - Moved openshift metrics and logging out of openshift_hosted playbook - Moved API Aggregation play to master install
* | | | | | | Merge pull request #5549 from ingvagabund/fix-etcd-backup-tagOpenShift Merge Robot2017-09-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue evaluate etcd_backup_tag variable Bug: 1495545
| * | | | | | | evaluate etcd_backup_tag variableJan Chaloupka2017-09-271-1/+1
| |/ / / / / /
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.133.0].Jenkins CD Merge Bot2017-09-282-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5538 from mgugino-upstream-stage/fix-centos-reposScott Dodson2017-09-276-19/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix origin repo deployment
| * | | | | | | Fix origin repo deploymentMichael Gugino2017-09-266-19/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge pull request #5518 from ingvagabund/set-quota-backend-bytes-explicitlyOpenShift Merge Robot2017-09-276-6/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue set the etcd backend quota to 4GB by default Bug: 1492891
| * | | | | | | | Set the etcd backend quota to 4GB by defaultJan Chaloupka2017-09-266-6/+20
| | | | | | | | |
* | | | | | | | | Merge pull request #5561 from jlebon/pr/papr-test-containerScott Dodson2017-09-271-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | papr: use F26 container for extended tests
| * | | | | | | | | papr: use F26 container for extended testsJonathan Lebon2017-09-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we updated the test nodes to F26, let's also update the extended tests container to match.
* | | | | | | | | | Merge pull request #5556 from vshn/aliastypo1Scott Dodson2017-09-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo in drop_etcdctl.yml
| * | | | | | | | | | Fix typo in drop_etcdctl.ymlMichael Hanselmann2017-09-271-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | s/alises/aliases/ says everything.
* | | | | | | | | | Merge pull request #5555 from mtnbikenc/fix-filter-loadingScott Dodson2017-09-274-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | 1496174 Rename filter_plugins to unique names
| * | | | | | | | | Rename filter_plugins to unique namesRussell Teague2017-09-274-0/+0
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter plugin modules should have unique names to not conflict with core Ansible modules. (Ansible 2.4)
* | | | | | | | | Merge pull request #5461 from ashcrow/papr-bumpScott Dodson2017-09-271-12/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | papr: Update to later versions
| * | | | | | | | papr: Workaround for RHBZ#1483553Steve Milner2017-09-271-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work originally done by @jlebon plus a bump up in RAM.
| * | | | | | | | papr: Use Fedora 26Steve Milner2017-09-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | | | | 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
| | |_|/ / / / / / / / | |/| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 09:43:50 +0000