summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-22Set master facts prior to adding new etcd client urls to master config.Andrew Butcher
2017-09-22Merge pull request #5354 from ashcrow/crio-systemcontainer-image-overrideOpenShift Merge Robot
Automatic merge from submit-queue cri-o: Allow full image override ``openshift_crio_systemcontainer_image_registry_override`` has been replaced with ``openshift_crio_systemcontainer_image_override``. The difference is ``openshift_crio_systemcontainer_image_override`` takes a full image path including the tag. Example: ``` openshift_crio_systemcontainer_image_override=gscrivano/cri-o-centos:latest ```
2017-09-22Merge pull request #5478 from sdodson/bz1490677OpenShift Merge Robot
Automatic merge from submit-queue Default openshift_pkg_version to full version-release during upgrades Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1490677 The versioning scheme for 3.7 pre-releases has changed and now all versions are 3.7.0 and the release is incremented on builds, ie: 3.7.0-0.124.0 upgraded to 3.7.0-0.125.0. If we know we're an upgrade and they haven't requested a specific package version defer the defaulting of openshift_pkg_version until the upgrade playbooks and there set it to the available version including the release.
2017-09-22Merge pull request #5476 from kwoodson/yedit_list_fixOpenShift Merge Robot
Automatic merge from submit-queue Returning actual results of yedit query. Empty list was returning empty dict. This is a simple change but since code generation happens it affects lots of files. The only change that is happening here is the following: ``` - rval = yamlfile.get(params['key']) or {}  + rval = yamlfile.get(params['key']) ``` When something returned as 0, [], or None the query would return {}. This was unintended.
2017-09-21Merge pull request #5433 from sdodson/resolvconfOpenShift Merge Robot
Automatic merge from submit-queue Ensure valid search on resolv.conf On cluster without internal name resolution there will be no `search XXX` on /etc/resolv.conf at all, thus this script will fail to add an entry for `cluster.local`. Forward ports #5398
2017-09-21Merge pull request #5226 from ewolinetz/template_service_brokerOpenShift Merge Robot
Automatic merge from submit-queue Creating initial tsb role to consume and apply templates provided for… … tsb cc: @deads2k @sdodson Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1486623 https://bugzilla.redhat.com/show_bug.cgi?id=1470623 https://bugzilla.redhat.com/show_bug.cgi?id=1491626
2017-09-21Merge pull request #5371 from ingvagabund/consolidate-etcd-certs-rolesOpenShift Merge Robot
Automatic merge from submit-queue consolidate etcd certs roles This is a starter for consolidation of all etcd like roles into a single `etcd` action-based role. I have intentionally started with the simplest one to demonstrate the steps needed to make it so and to make the review easy enough for everyone.
2017-09-21Merge pull request #5477 from mgugino-upstream-stage/hot-fix-oreg_urlOpenShift Merge Robot
Automatic merge from submit-queue Remove default value for oreg_url Due to some plays importing variables from roles directly, oreg_url was being set to a default value when it otherwise shouldn't be. This commit removes the default values for oreg_url to ensure existing logic works as desired. Fixes: https://github.com/openshift/openshift-ansible/issues/5455
2017-09-21Merge pull request #5456 from bliemli/masterOpenShift Merge Robot
Automatic merge from submit-queue Fix deprecated subscription-manager command `subscription-manager subscribe` is deprecated, use `attach` instead.
2017-09-21Merge pull request #5473 from abutcher/scaleup-network-valuesScott Dodson
Set network facts using first master's config during scaleup.
2017-09-21Automatic commit of package [openshift-ansible] release [3.7.0-0.127.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-21Merge pull request #5309 from vshn/metrics-annot1OpenShift Merge Robot
Automatic merge from submit-queue Support setting annotations on Hawkular route Our setup uses annotations to request a separate component, namely the ACME Controller[1], to request domain-validated certificates from the Let's Encrypt CA. By setting the necessary annotation via Ansible rather than manually the system will automatically retrieve a certificate. [1] https://github.com/tnozicka/openshift-acme
2017-09-21Merge pull request #5429 from giuseppe/node-specify-dns-domainOpenShift Merge Robot
Automatic merge from submit-queue node: specify the DNS domain
2017-09-21Fix deprecated subscription-manager commandBenjamin Affolter
2017-09-20Merge pull request #5363 from ewolinetz/default_aggregationOpenShift Merge Robot
Automatic merge from submit-queue Updating to always configure api aggregation with installation This moves the wiring of the aggregator up into the config playbook as we want to enable this by default with an installation. Resolves https://github.com/openshift/openshift-ansible/issues/5056
2017-09-20Merge pull request #5474 from simo5/noreconcileOpenShift Merge Robot
Automatic merge from submit-queue Do not reconcile in >= 3.7 Starting with 3.7 we use kube's RBAC which happens to do a forceful reconcile at server startup. Explicit reconciles are not needed anymore.
2017-09-20Merge pull request #5357 from ↵OpenShift Merge Robot
juanvallejo/jvallejo/add-health-checks-upgrade-path Automatic merge from submit-queue add health checks 3_6,3_7 upgrade path Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1483931 Adds health checks to `upgrade_control_plane` and `upgrade_nodes` in 3_6 and 3_7. cc @sosiouxme @rhcarvalho @brenton
2017-09-20Returning actual results of yedit query. Empty list was returning empty dict.Kenny Woodson
2017-09-20Merge pull request #5014 from ↵OpenShift Merge Robot
juanvallejo/jvallejo/add-additonal-checks-upgrade-path Automatic merge from submit-queue Adding additonal checks upgrade path Depends on https://github.com/openshift/openshift-ansible/pull/4960 TODO - Possibly handle `upgrade` playbook context on `etcd_volume` check cc @sosiouxme @rhcarvalho
2017-09-20Default openshift_pkg_version to full version-release during upgradesScott Dodson
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1490677 The versioning scheme for 3.7 pre-releases has changed and now all versions are 3.7.0 and the release is incremented on builds, ie: 3.7.0-0.124.0 upgraded to 3.7.0-0.125.0. If we know we're an upgrade and they haven't requested a specific package version defer the defaulting of openshift_pkg_version until the upgrade playbooks and there set it to the available version including the release.
2017-09-20Updating to always configure api aggregation with installationEric Wolinetz
2017-09-20Merge pull request #5378 from mgugino-upstream-stage/cleanup-deployment-typesOpenShift Merge Robot
Automatic merge from submit-queue Cleanup old deployment types Previously, openshift-ansible supported various types of deployments using the variable "openshift_deployment_type" Currently, openshift-ansible only supports two deployment types, "origin" and "openshift-enterprise". This commit removes all logic and references to deprecated deployment types.
2017-09-20Remove default value for oreg_urlMichael Gugino
Due to some plays importing variables from roles directly, oreg_url was being set to a default value when it otherwise shouldn't be. This commit removes the default values for oreg_url to ensure existing logic works as desired. Fixes: https://github.com/openshift/openshift-ansible/issues/5455
2017-09-20Do not reconcile in >= 3.7Simo Sorce
Starting with 3.7 we use kube's RBAC which happens to do a forceful reconcile at server startup. Explicit reconciles are not needed anymore. Also drop obsolete version checks and simplify 'when' conditional Signed-off-by: Simo Sorce <simo@redhat.com>
2017-09-20Creating initial tsb role to consume and apply templates provided for tsbEric Wolinetz
2017-09-20Set network facts using first master's config during scaleup.Andrew Butcher
2017-09-20Cleanup old deployment typesMichael Gugino
Previously, openshift-ansible supported various types of deployments using the variable "openshift_deployment_type" Currently, openshift-ansible only supports two deployment types, "origin" and "openshift-enterprise". This commit removes all logic and references to deprecated deployment types.
2017-09-20Merge pull request #5322 from mtnbikenc/proposal-playbook-consolidationScott Dodson
[Proposal] OpenShift-Ansible Playbook Consolidation
2017-09-20Merge pull request #3753 from soltysh/issue12558OpenShift Merge Robot
Automatic merge from submit-queue Increase rate limiting in journald.conf @sdodson ptal, this is to address issues from https://github.com/openshift/origin/issues/12558 @smarterclayton @stevekuznetsov fyi
2017-09-20crio: ensure no default CNI configuration files are leftGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-20node: specify the DNS domainGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-19Merge pull request #3778 from lhuard1A/rh_subscription_resilientOpenShift Merge Robot
Automatic merge from submit-queue Make RH subscription more resilient to temporary failures subscription-manager can sometimes fail because of server side errors. Manually replaying the command usually works. So, let’s make openshift-ansible more resilient to temporary failures of subscription-manager by retrying the failed commands with a maximum of 3 retries. Here is an example of such sporadic errors: ``` TASK [rhel_subscribe : Retrieve the OpenShift Pool ID] ************************* ok: [lenaic-node-compute-c96e7] ok: [lenaic-master-bbe09] ok: [lenaic-node-compute-2976a] fatal: [lenaic-node-infra-47ba5]: FAILED! => {"changed": false, "cmd": ["subscription-manager", "list", "--available", "--matches=Red Hat OpenShift Container Platform, Premium*", "--pool-only"], "delta": "0:00:07.152650", "end": "2017-04-04 11:24:59.729405", "failed": true, "rc": 70, "start": "2017-04-04 11:24:52.576755", "stderr": "Unable to verify server's identity: (104, 'Connection reset by peer')", "stdout": "", "stdout_lines": [], "warnings": []} TASK [rhel_subscribe : Determine if OpenShift Pool Already Attached] *********** skipping: [lenaic-master-bbe09] skipping: [lenaic-node-compute-2976a] skipping: [lenaic-node-compute-c96e7] TASK [rhel_subscribe : fail] *************************************************** skipping: [lenaic-node-compute-2976a] skipping: [lenaic-master-bbe09] skipping: [lenaic-node-compute-c96e7] TASK [rhel_subscribe : Attach to OpenShift Pool] ******************************* fatal: [lenaic-node-compute-c96e7]: FAILED! => {"changed": true, "cmd": ["subscription-manager", "subscribe", "--pool", "8a85f9814ff0134a014ff43b44095513"], "delta": "0:00:21.421300", "end": "2017-04-04 11:25:20.655873", "failed": true, "rc": 70, "start": "2017-04-04 11:24:59.234573", "stderr": "Unable to verify server's identity: (104, 'Connection reset by peer')", "stdout": "Successfully attached a subscription for: Red Hat OpenShift Container Platform, Premium (1-2 Sockets)", "stdout_lines": ["Successfully attached a subscription for: Red Hat OpenShift Container Platform, Premium (1-2 Sockets)"], "warnings": []} changed: [lenaic-master-bbe09] changed: [lenaic-node-compute-2976a] ``` In this example, subscription-manager was failing on some nodes, but not all. Retrying on the failed nodes would have avoided to abandon those nodes.
2017-09-19Merge pull request #5380 from ↵OpenShift Merge Robot
mgugino-upstream-stage/fix-openshift-version-pkg-install Automatic merge from submit-queue Only install base openshift package on masters and nodes Recent refactoring to remove openshift_common resulted in base openshift rpm's being installed on more hosts than previous. This situation results in hosts that would otherwise not need access to openshift repositories to require them. This patch set results in only openshift_masters and openshift_nodes to have the openshift base package installed.
2017-09-19Merge pull request #5464 from sosiouxme/20170919-repoquery-bz1482551OpenShift Merge Robot
Automatic merge from submit-queue repoquery bz1482551 followup Adding retries on the repoqueries I missed in https://github.com/openshift/openshift-ansible/pull/5401
2017-09-19Merge pull request #5416 from wozniakjan/bug1491636/honor_ops_nodeselectorOpenShift Merge Robot
Automatic merge from submit-queue Bug 1491636 - honor openshift_logging_es_ops_nodeselector https://bugzilla.redhat.com/show_bug.cgi?id=1491636
2017-09-19Merge pull request #5274 from sosiouxme/20170828-checks-save-resultsOpenShift Merge Robot
Automatic merge from submit-queue openshift_checks: enable writing results to files An iteration on how to record check results in a directory structure readable by machines and humans. Some refactoring of checks and the action plugin to enable writing files locally about the check operation and results, if the user wants them. This is aimed at enabling persistent and machine-readable results from recurring runs of health checks. Now, rather than trying to build a result hash to return from running each check, checks can just register what they need to as they're going along, and the action plugin processes state when the check is done. Checks can register failures, notes about what they saw, and arbitrary files to be saved into a directory structure where the user specifies. If no directory is specified, no files are written. At this time checks can still return a result hash, but that will likely be refactored away in the next iteration. Multiple failures can be registered without halting check execution. Throwing an exception or returning a hash with "failed" is registered as a failure. execute_module now does a little more with the results. Results are automatically included in notes and written individually as files. "changed" results are propagated. Some json results are decoded. A few of the checks were enhanced to use these features; all get some of the features for free. Action items: - [x] Provide a way for user to specify an output directory where they want results written - [x] Enable a check to register multiple failures and not have to assemble them in result - [x] Enable a check to register "notes" that will be saved to files but not displayed - [x] Have module invocations recorded individually as well as in notes - [x] Enable a check to register files (logs, etc.) from remote host that are to be copied to output dir - [x] Enable a check to register arbitrary file contents that are to be written to output - [ ] Take advantage of these features where possible in checks (Last item done somewhat, more should happen as we go along...)
2017-09-19more retries on repoquery_cmdLuke Meyer
2017-09-19Merge pull request #5450 from ingvagabund/fix-etcd-backup-msg-errorJan Chaloupka
Fix etcd backup msg error
2017-09-19fix etcd back message errorJan Chaloupka
2017-09-18Merge pull request #5156 from mangirdaz/5155-hotfixOpenShift Merge Robot
Automatic merge from submit-queue hot fix for env variable resolve If we use environment variables in our inventory files (and from what I seen we do this everywhere where We deploy OCP) our fact engine ignores env variables so if my path looks like ``` openshift_hosted_registry_routecertificates={"certfile": "{{inventory_dir}}/../files/certs/wildcard.registry.company.local.crt", "keyfile": "{{inventory_dir}}/../files/certs/wildcard.registry.companylocal.key", "cafile":"{{inventory_dir}}/../files/certs/CompanyLocalRootCA.crt"} openshift_hosted_registry_routehost=containers.registry.comany.local ``` the result is: `/../files/certs/RoSLocalRootCA.crt` We need to fix our fact set in a long run to read Ansible variables. And it was done in the same way with router certificates already.
2017-09-18Merge pull request #5441 from mgugino-upstream-stage/fix-reg-authOpenShift Merge Robot
Automatic merge from submit-queue Fix registry auth task ordering Currently, registry authentication credentials are not produced until after docker systemd service files are created. This commit ensures the credentials are created before the systemd service files to ensure the proper boolean is set to include the read-only mount of credentials inside containerized nodes and masters. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-09-18Merge pull request #5439 from zgalor/prometheus-fixesOpenShift Merge Robot
Automatic merge from submit-queue Prometheus role fixes - Use official prometheus-alert-buffer image - Add prometheus annotations to service
2017-09-18openshift_checks: enable providing file outputsLuke Meyer
Some refactoring of checks and the action plugin to enable writing files locally about the check operation and results, if the user wants them. This is aimed at enabling persistent and machine-readable results from recurring runs of health checks. Now, rather than trying to build a result hash to return from running each check, checks can just register what they need to as they're going along, and the action plugin processes state when the check is done. Checks can register failures, notes about what they saw, and arbitrary files to be saved into a directory structure where the user specifies. If no directory is specified, no files are written. At this time checks can still return a result hash, but that will likely be refactored away in the next iteration. Multiple failures can be registered without halting check execution. Throwing an exception or returning a hash with "failed" is registered as a failure. execute_module now does a little more with the results. Results are automatically included in notes and written individually as files. "changed" results are propagated. Some json results are decoded. A few of the checks were enhanced to use these features; all get some of the features for free.
2017-09-18Merge pull request #5430 from ashcrow/always-required-new-variablesOpenShift Merge Robot
Automatic merge from submit-queue Always required new variables Related to https://bugzilla.redhat.com/show_bug.cgi?id=1451023
2017-09-18Consolidate etcd certs rolesJan Chaloupka
This is a part of the etcd_ like role consolidationi into an action-based role. As part of the consilidation some roles have been removed and some replaced by include_role module. Resulting in reorder and shift of role dependencies from a role into a play.
2017-09-18Merge pull request #5237 from smarterclayton/gceOpenShift Merge Robot
Automatic merge from submit-queue Port origin-gce roles for cluster setup to copy AWS provisioning This is a rough cut of the existing origin-gce structure (itself a refined version of the ref arch). I've removed everything except core cluster provisioning, image building, and inventory setup. Node groups are part of the "all at once" provisioning but can be changed. @kwoodson we should talk on monday, this is me adapting the origin-gce dynamic provisioning to be roughly parallel to openshift_aws. Still some topics we should discuss.
2017-09-18Merge pull request #5392 from ↵OpenShift Merge Robot
ingvagabund/pull-openshift_master-deps-out-into-a-play Automatic merge from submit-queue Pull openshift_master deps out into a play The `openshift_master` role is called only in a single play. Thus, we can pull out all its dependencies without duplicating all dependency role invocations. Both `lib_openshift` and `lib_os_firewall` are required deps as they defined ansible modules used inside the `openshift_master` role. I have also rearranged definition of variables so variable used only inside a single role are part of the `include_role` statement. Atm, we can't use `include_role` due to https://github.com/ansible/ansible/issues/21890
2017-09-18Merge pull request #5431 from sosiouxme/20170915-system-container-cwdOpenShift Merge Robot
Automatic merge from submit-queue update system container cwd This changes the cwd for the system container to be the base of the openshift-ansible content. This way the playbook can be specified as a relative path, and in the future when we drop the symlinks for various plugins and rely on cwd to find them, this will still work. Looking through the Dockerfile side of things I noticed that the run script changes directories to WORK_DIR which is the content base, so this change brings the two methods closer together. I was looking for anything that actually wrote to the current directory (which is $HOME at the beginning of the run script) and found one, the vault password. It seemed slightly more robust to write that to a temporary location instead so I tacked on a commit to do that as well.
2017-09-18Fix registry auth task orderingMichael Gugino
Currently, registry authentication credentials are not produced until after docker systemd service files are created. This commit ensures the credentials are created before the systemd service files to ensure the proper boolean is set to include the read-only mount of credentials inside containerized nodes and masters. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-09-18Prometheus role fixesZohar Galor
- Use official prometheus-alert-buffer image - Add prometheus annotations to service