summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2689 from tdawson/2016-10-dockerfile-labelsScott Dodson2016-10-311-0/+3
|\ | | | | add io labels to Dockerfile
| * add io labelsTroy Dawson2016-10-311-0/+3
|/
* Merge pull request #2686 from sdodson/BZ1390169Scott Dodson2016-10-312-1/+21
|\ | | | | Touch all ini_file files before using them
| * Touch all ini_file files before using themScott Dodson2016-10-312-1/+21
| | | | | | | | | | | | | | | | | | Ansible 2.2 adds 'create' flag, however we'd like to preserve backwards compatability. Fixes bug 1390169 Fixes BZ1390169 Fixes #2668
* | Merge pull request #2680 from tbielawa/BZ389137Scott Dodson2016-10-311-2/+22
|\ \ | |/ |/| Remove commit offset strings from parsed versions
| * Remove commit offset strings from parsed versionsTim Bielawa2016-10-311-2/+22
|/
* Automatic commit of package [openshift-ansible] release [3.4.15-1].Troy Dawson2016-10-312-2/+7
|
* Merge pull request #2682 from dgoodwin/bump-documented-releaseScott Dodson2016-10-282-2/+2
|\ | | | | Bump documented openshift_release for 1.4/3.4.
| * Bump documented openshift_release for 1.4/3.4.Devan Goodwin2016-10-282-2/+2
| |
* | Merge pull request #2679 from erinn/masterScott Dodson2016-10-281-1/+6
|\ \ | | | | | | Add requirements, fix a small formatting issue.
| * | Add requirements, fix a small formatting issue.Erinn Looney-Triggs2016-10-271-1/+6
| | |
* | | Automatic commit of package [openshift-ansible] release [3.4.14-1].Troy Dawson2016-10-282-2/+8
|/ /
* | Merge pull request #2669 from dgoodwin/restart-ha-controllers-alwaysScott Dodson2016-10-272-2/+2
|\ \ | | | | | | Change HA master controller service to restart always.
| * | Change HA master controller service to restart always.Devan Goodwin2016-10-272-2/+2
| |/ | | | | | | | | | | | | | | | | | | Restarts of systemd-journald can cause the master controllers service to die in HA environments, due to a SIGPIPE and how it's handled. (seemingly by default in golang) on-failure does not trigger in this situation, instead we set to Restart=always in the systemd unit, which matches the non-HA service definitions as well.
* | Merge pull request #2670 from abutcher/hosted-registry-insecureScott Dodson2016-10-264-5/+24
|\ \ | | | | | | Bug 1388016 - The insecure-registry address was removed during upgrade
| * | Default hosted_registry_insecure true when insecure registry present in ↵Andrew Butcher2016-10-264-5/+24
| | | | | | | | | | | | existing /etc/sysconfig/docker.
* | | Merge pull request #2667 from smunilla/BZ1385449Scott Dodson2016-10-261-2/+5
|\ \ \ | | | | | | | | Fix race condtion in openshift_facts
| * | | Fix race condtion in openshift_factsSamuel Munilla2016-10-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If, for some reason, two facts processes were run simultaneously on the same host, creating the directory could cause an exception. This should help with that. Fixes Bug 1385449
* | | | Automatic commit of package [openshift-ansible] release [3.4.13-1].Troy Dawson2016-10-262-2/+15
|/ / /
* | | Merge pull request #2662 from blues-man/update_doc_upgrade_openshiftScott Dodson2016-10-251-2/+2
|\ \ \ | | | | | | | | Update link to latest versions upgrade README
| * | | Update link to latest versions upgrade READMENatale Vinto2016-10-251-2/+2
| |/ /
* | | Merge pull request #2663 from dgoodwin/34-upgradeScott Dodson2016-10-255-0/+313
|\ \ \ | | | | | | | | Add support for 3.4 upgrade.
| * | | Add support for 3.4 upgrade.Devan Goodwin2016-10-255-0/+313
| | |/ | |/| | | | | | | | | | This is a direct copy of 3.3 upgrade playbooks, with 3.3 specific hooks removed and version numbers adjusted appropriately.
* | | Merge pull request #2637 from dgoodwin/ctrl-plane-restartScott Dodson2016-10-253-12/+9
|\ \ \ | | | | | | | | Fix and reorder control plane service restart.
| * | | Fix and reorder control plane service restart.Devan Goodwin2016-10-213-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in the standalone upgrade control plane playbook. However it also looks to be out of order, we should restart before reconciling and upgrading nodes. As such moved the restart directly into the control plane upgrade common code, and placed it before reconciliation.
* | | | Merge pull request #2615 from tbielawa/node-labels-fixTim Bielawa2016-10-253-5/+42
|\ \ \ \ | | | | | | | | | | Set node-labels in kubeletArguments
| * | | | Add node-labels to kubeletArgumentsTim Bielawa2016-10-203-5/+42
| | | | | | | | | | | | | | | | | | | | * Node labels are parsed from openshift_node_labels if they exist
* | | | | Merge pull request #2664 from sdodson/bz1387529Scott Dodson2016-10-251-2/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | [upgrades] Fix containerized node
| * | | | [upgrades] Fix containerized nodeScott Dodson2016-10-251-2/+0
|/ / / / | | | | | | | | | | | | This file was removed and no longer used
* | | | Merge pull request #2654 from detiber/nix_vagrantScott Dodson2016-10-242-123/+1
|\ \ \ \ | | | | | | | | | | Remove Vagrantfile
| * | | | Remove VagrantfileJason DeTiberus2016-10-242-123/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove Vagrantfile - Update README_vagrant.md to point to openshift-ansible-contrib for a vagrant-based installation
* | | | | Merge pull request #2655 from sdodson/image-stream-syncScott Dodson2016-10-244-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Bump logging and metrics deployers to 3.3.1 and 3.4.0
| * | | | | Bump logging and metrics deployers to 3.3.1 and 3.4.0Scott Dodson2016-10-244-8/+8
|/ / / / /
* | | | | Merge pull request #2641 from vishpat/cert-validityAndrew Butcher2016-10-243-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Added a parameter for cert validity for Nuage components
| * | | | Added a parameter for cert validityVishal Patil2016-10-213-3/+3
| | | | |
* | | | | Merge pull request #2650 from sdodson/issue2646Andrew Butcher2016-10-241-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Enable dnsmasq service
| * | | | Enable dnsmasq serviceScott Dodson2016-10-241-0/+6
| | | | |
* | | | | Merge pull request #2649 from abutcher/default-modify-imagestreamsAndrew Butcher2016-10-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Default infra template modification based on openshift_examples_modify_imagestreams
| * | | | | Default infra template modification based on ↵Andrew Butcher2016-10-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | openshift_examples_modify_imagestreams
* | | | | Automatic commit of package [openshift-ansible] release [3.4.12-1].Troy Dawson2016-10-242-2/+9
| | | | |
* | | | | Merge pull request #2573 from abutcher/infra-templatesScott Dodson2016-10-2434-22/+108
|\ \ \ \ \ | |_|/ / / |/| | | | Move infrastructure templates into openshift_hosted_templates role.
| * | | | Move infrastructure templates into openshift_hosted_templates role.Andrew Butcher2016-10-2134-22/+108
|/ / / /
* | | | Merge pull request #2639 from tbielawa/test-utils-debuggingAndrew Butcher2016-10-211-0/+72
|\ \ \ \ | | | | | | | | | | Unit tests for the debug_env logger thing
| * | | | Unit tests for the debug_env logger thingTim Bielawa2016-10-211-0/+72
| | | | |
* | | | | Merge pull request #2563 from smunilla/BZ1339621Andrew Butcher2016-10-218-247/+328
|\ \ \ \ \ | |/ / / / |/| | | | a-o-i: Separate install and scaleup workflows
| * | | | a-o-i: Separate install and scaleup workflowsSamuel Munilla2016-10-208-247/+328
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | In order to simplify the quick installer logic, this moves the scaleup workflow into its own subcommand. Fixes: Bug 1339621
* | | | Merge pull request #2624 from abutcher/rm-hosted-registry-object-storage-varsScott Dodson2016-10-211-42/+42
|\ \ \ \ | | | | | | | | | | Reference full vars for registry object storage.
| * | | | Reference full vars for registry object storage.Andrew Butcher2016-10-181-42/+42
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.4.11-1].Troy Dawson2016-10-212-2/+25
| | | | |
* | | | | Merge pull request #2638 from henningf/masterScott Dodson2016-10-211-4/+4
|\ \ \ \ \ | | | | | | | | | | | | trouble creating service signer certificate while running upgrade dockerized