summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2630 from abutcher/fix-default-callbackScott Dodson2016-10-191-0/+3
|\ | | | | Fix maximum recursion depth exceeded in default callback
| * Override __init__ in default callback to avoid infinite loop.Andrew Butcher2016-10-191-0/+3
|/
* Merge pull request #2620 from mscherer/cleanup_split_argsJason DeTiberus2016-10-191-1/+0
|\ | | | | Remove uneeded import of ansible.module_utils.splitter
| * Remove uneeded import of ansible.module_utils.splitterMichael Scherer2016-10-191-1/+0
| |
* | Merge pull request #2621 from dgoodwin/symlink-fixScott Dodson2016-10-1920-42/+43
|\ \ | | | | | | Switch from "oadm" to "oc adm" and fix bug in binary sync.
| * | Switch from "oadm" to "oc adm" and fix bug in binary sync.Devan Goodwin2016-10-1920-42/+43
| | | | | | | | | | | | | | | | | | | | | | | | Found bug syncing binaries to containerized hosts where if a symlink was pre-existing, but pointing to the wrong destination, it would not be corrected. Switched to using oc adm instead of oadm.
* | | Automatic commit of package [openshift-ansible] release [3.4.10-1].Troy Dawson2016-10-192-2/+9
| |/ |/|
* | Merge pull request #2611 from abutcher/systemd-units-node-configScott Dodson2016-10-173-5/+2
|\ \ | | | | | | Build full node config path in systemd_units tasks.
| * \ Merge pull request #2 from sdodson/systemd-units-node-configAndrew Butcher2016-10-173-5/+2
| |\ \ | | | | | | | | Get rid of openshift_node_config_file entirely
| | * | Get rid of openshift_node_config_file entirelyScott Dodson2016-10-173-5/+2
| |/ /
| * | Build full node config path in systemd_units tasks.Andrew Butcher2016-10-171-1/+1
| | |
* | | Merge pull request #2612 from sdodson/loggingScott Dodson2016-10-171-6/+6
|\ \ \ | | | | | | | | [logging] Fix NFS volume binding
| * | | [logging] Fix NFS volume bindingScott Dodson2016-10-171-6/+6
|/ / /
* | | Merge pull request #2608 from abutcher/template-with-itemsScott Dodson2016-10-1728-49/+49
|\ \ \ | | | | | | | | Template with_items for upstream ansible-2.2 compat.
| * | | Default []Andrew Butcher2016-10-151-1/+1
| | | |
| * | | Template with_items for upstream ansible-2.2 compat.Andrew Butcher2016-10-1428-49/+49
| |/ /
* | / Automatic commit of package [openshift-ansible] release [3.4.9-1].Troy Dawson2016-10-172-2/+13
| |/ |/|
* | Merge pull request #2590 from vshn/feature/s3_regionendpointJason DeTiberus2016-10-153-0/+35
|\ \ | | | | | | add regionendpoint parameter for registry s3
| * | formatting updates in templateTobias Brunner2016-10-141-1/+1
| | |
| * | revise docsTobias Brunner2016-10-132-2/+2
| | |
| * | adjustments in docs and j2 templateTobias Brunner2016-10-123-3/+20
| | |
| * | add regionendpoint parameter for registry s3Tobias Brunner2016-10-122-0/+18
| | |
* | | Merge pull request #2607 from vshn/fix/2602Andrew Butcher2016-10-141-1/+1
|\ \ \ | | | | | | | | Do not error on node labels set too non-string values.
| * | | Do not error on node labels set too non-string values.Manuel Hutter2016-10-141-1/+1
| | |/ | |/| | | | | | | see #2602
* | | Merge pull request #2605 from sdodson/loggingScott Dodson2016-10-141-6/+6
|\ \ \ | |/ / |/| | [logging] Use inventory variables rather than facts
| * | Use inventory variables rather than factsScott Dodson2016-10-141-6/+6
| | |
* | | Merge pull request #2604 from dgoodwin/restart-nodes-againScott Dodson2016-10-141-0/+4
|\ \ \ | | | | | | | | Resume restarting node after upgrading node rpms.
| * | | Resume restarting node after upgrading node rpms.Devan Goodwin2016-10-141-0/+4
|/ / / | | | | | | | | | | | | | | | | | | Error in commit 245fef16573757b6e691c448075d8564f5d569f4. As it turns out this is the only place a rpm based node can be restarted in upgrade. Restoring the restart but making it conditional to avoid the two issues reported with out of sync node restarts.
* | | Merge pull request #2603 from dgoodwin/skip-docker-avail-checkScott Dodson2016-10-141-2/+4
|\ \ \ | | | | | | | | upgrade: Don't check avail docker version if not already installed.
| * | | upgrade: Don't check avail docker version if not already installed.Devan Goodwin2016-10-141-2/+4
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.4.8-1].Troy Dawson2016-10-142-2/+10
| | |
* | | Merge pull request #2598 from detiber/2547Scott Dodson2016-10-132-4/+4
|\ \ \ | | | | | | | | update handling of use_dnsmasq
| * | | update handling of use_dnsmasqJason DeTiberus2016-10-132-4/+4
| | | |
* | | | Merge pull request #2599 from dgoodwin/node-docker-upgradeScott Dodson2016-10-131-0/+2
|\ \ \ \ | | | | | | | | | | Fix standalone docker upgrade playbook skipping nodes.
| * | | | Fix standalone docker upgrade playbook skipping nodes.Devan Goodwin2016-10-131-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | Transition to being able to specify nodes to upgrade caused standalone nodes to get skipped in this playbook.
* | | | Merge pull request #2595 from tbielawa/aoi-fix-runner-on-failedTim Bielawa2016-10-131-1/+3
|\ \ \ \ | | | | | | | | | | Fix missing play assignment in a-o-i callback plugin
| * | | | Fix missing play assignment in a-o-i callback pluginTim Bielawa2016-10-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a task fails in the quick installer it calls the `v2_runner_on_failed` method in the callback plugin. I missed setting `self._play` in the first iteration of the callback plugin, which it turns out is critical for the `on_failed` method to work. This fixes that by adding back in the assignment in the `play_start` method.
* | | | | Merge pull request #2586 from cgwalters/seboolean-handle-aliasesScott Dodson2016-10-132-19/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | | nfs: Handle seboolean aliases not just in Fedora
| * | | | nfs: Handle seboolean aliases not just in FedoraColin Walters2016-10-122-19/+15
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm testing with a bleeding edge RHEL Atomic Host, and it looks like we pulled in a new version of selinux-policy that has `virt_sandbox_use_nfs` aliased to `virt_use_nfs`. In https://github.com/openshift/openshift-ansible/pull/2356 Adam changed this to check for Fedora. This changes things to drop the distribution check, and instead parse the `getsebool` output to determine whether or not the boolean is an alias, and should hence work on all distributions/versions.
* | | | Merge pull request #2593 from dgoodwin/remove-node-restartScott Dodson2016-10-121-3/+0
|\ \ \ \ | | | | | | | | | | Stop restarting node after upgrading master rpms.
| * | | | Stop restarting node after upgrading master rpms.Devan Goodwin2016-10-121-3/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looks to be causing a customer issue where some HA upgrades fail, due to a missing EgressNetworkPolicy API. We update master rpms, we don't restart services yet, but then restart node service which tries to talk to an API that does not yet exist. (pending restart) Restarting node here is very out of place and appears to not be required.
* | | | Merge pull request #2592 from smunilla/BZ1381411Scott Dodson2016-10-121-3/+8
|\ \ \ \ | |_|_|/ |/| | | Fix upgrade mappings in quick installer
| * | | Fix upgrade mappings in quick installerSamuel Munilla2016-10-121-3/+8
|/ / / | | | | | | | | | | | | | | | | | | Update to use the correct playbook for 3.2 to 3.3 upgrades and some error handling for unsupported upgrades. Fixes Bug 1381411
* / / Automatic commit of package [openshift-ansible] release [3.4.7-1].Troy Dawson2016-10-122-2/+11
|/ /
* | Merge pull request #2584 from jhcook/variable_with_no_default_2576Scott Dodson2016-10-112-2/+2
|\ \ | |/ |/| set defaults for debug_level in template and task
| * Merge branch 'master' of github.com:openshift/openshift-ansible into ↵Justin Cook2016-10-118-23/+54
| |\ | |/ |/| | | variable_with_no_default_2576
* | Merge pull request #2579 from sdodson/fix-registry-volume-namespaceAndrew Butcher2016-10-101-2/+9
|\ \ | | | | | | Fix config and namespace for registry volume detection
| * | Fix config and namespace for registry volume detectionScott Dodson2016-10-101-2/+9
| | |
* | | Merge pull request #2581 from sdodson/bz1377089Scott Dodson2016-10-102-2/+2
|\ \ \ | | | | | | | | Set HTTPS_PROXY in example builddefaults_json
| * | | Set HTTPS_PROXY in example builddefaults_jsonScott Dodson2016-10-102-2/+2
|/ / /