summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2948 from dagwieers/patch-3Scott Dodson2016-12-081-0/+2
|\ | | | | Silence warnings when using rpm directly
| * Silence warnings when using rpm directlyDag Wieers2016-12-081-0/+2
| |
* | Merge pull request #2943 from detiber/fixOpenShiftReleaseScott Dodson2016-12-084-3/+12
|\ \ | | | | | | Properly handle x.y.z formatted versions for openshift_release
| * | Remove Hostname from 1.1 and 1.2 predicatesJason DeTiberus2016-12-072-3/+0
| | |
| * | Properly handle x.y.z formatted versions for openshift_releaseJason DeTiberus2016-12-074-0/+12
| | |
* | | Merge pull request #2952 from tbielawa/fix-coverage-eraseScott Dodson2016-12-081-1/+1
|\ \ \ | | | | | | | | Fix coverage not appending new data
| * | | Fix coverage not appending new dataTim Bielawa2016-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds '--cover-erase' flag to the 'ci-unittests' target Fixes bug introduced in d7b4265f329591817bac381e2772ae14ac337cea: "Can't add arcs to existing line data" error message
* | | | Merge pull request #2950 from dgoodwin/drop-32-upgradeScott Dodson2016-12-083-84/+0
|\ \ \ \ | |/ / / |/| | | Drop 3.2 upgrade playbooks.
| * | | Drop 3.2 upgrade playbooks.Devan Goodwin2016-12-083-84/+0
| | |/ | |/|
* | | Merge pull request #2946 from dagwieers/patch-1Scott Dodson2016-12-081-0/+2
|\ \ \ | | | | | | | | Silence warnings when using some commands directly
| * | | Silence warnings when using rpm directlyDag Wieers2016-12-081-0/+2
| |/ /
* | | Merge pull request #2947 from dagwieers/patch-2Scott Dodson2016-12-081-0/+2
|\ \ \ | |/ / |/| | Silence warnings when using rpm directly
| * | Silence warnings when using rpm directlyDag Wieers2016-12-081-0/+2
|/ /
* | Merge pull request #2934 from sdodson/etcd3-v2Scott Dodson2016-12-071-7/+4
|\ \ | |/ |/| etcd_upgrade: Simplify package installation
| * etcd_upgrade: Simplify package installationScott Dodson2016-12-071-7/+4
| |
* | Merge pull request #2939 from tbielawa/gh2933Jason DeTiberus2016-12-071-6/+15
|\ \ | | | | | | Speed up 'make ci' and trim the output
| * | Speed up 'make ci' and trim the outputTim Bielawa2016-12-071-6/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The virtualenv is conditionally rebuilt now if the test requirements file is modified. This will save upwards of 30+ seconds in iterative 'make ci' runs. The pylint output is now trimmed to exclude disabled tests. The order of the 'ci' target prerequisites has been changed to run the fastest tests first. Closes #2933
* | Merge pull request #2892 from detiber/upgradeSchedulerScott Dodson2016-12-079-269/+573
|\ \ | |/ |/| Scheduler upgrades
| * add comments and remove debug codeJason DeTiberus2016-12-071-2/+8
| |
| * Handle updating of scheduler config during upgradeJason DeTiberus2016-12-067-257/+549
| | | | | | | | | | | | | | | | | | | | | | - do not upgrade predicates if openshift_master_scheduler_predicates is defined - do not upgrade priorities if openshift_master_scheduler_priorities is defined - do not upgrade predicates/priorities unless they match known previous default configs - output WARNING to user if predictes/priorities are not updated during install
| * Fix templatingJason DeTiberus2016-12-061-9/+9
| |
| * test updatesJason DeTiberus2016-12-062-4/+10
| | | | | | | | | | | | - fix nose coverage flags - add coverage support for files tested outside of the utils directory - exclude stdlib and virtualenv installed dependencies
* | Merge pull request #2928 from sdodson/etcd3-v2Scott Dodson2016-12-064-19/+21
|\ \ | |/ |/| Fix etcd upgrades to etcd 3.x
| * Always install latest etcd for containerized hostsScott Dodson2016-12-061-3/+5
| |
| * etcd_upgrade : Use different variables for rpm vs container versionsScott Dodson2016-12-061-10/+10
| |
| * Switch back to using etcd rather than etcd3Scott Dodson2016-12-062-6/+6
|/
* Merge pull request #2920 from detiber/schedulerVarFixAndrew Butcher2016-12-053-20/+18
|\ | | | | Scheduler var fix
| * Update scheduler predicate/priorities varsJason DeTiberus2016-12-012-20/+16
| | | | | | | | | | | | - Introduce additional variables for current scheduler config and default values to better determine if the values we are getting are user-defined, coming from config or are the default values.
| * fix tagsJason DeTiberus2016-12-011-0/+2
| |
* | Merge pull request #2915 from sdodson/BZ1401425Scott Dodson2016-12-051-0/+4
|\ \ | | | | | | node_dnsmasq - restart dnsmasq if it's not currently running
| * | node_dnsmasq - restart dnsmasq if it's not currently runningScott Dodson2016-12-051-0/+4
| | | | | | | | | | | | | | | Fixes Bug 1401425 Fixes BZ1401425
* | | Merge pull request #2914 from abutcher/upgrade-admission-checkScott Dodson2016-12-054-2/+6
|\ \ \ | |/ / |/| | Conditionalize master config update for admission_plugin_config.
| * | Conditionalize master config update for admission_plugin_config.Andrew Butcher2016-12-054-2/+6
|/ /
* | Merge pull request #2908 from tremble/upgrade_factsScott Dodson2016-12-051-0/+1
|\ \ | | | | | | upgrade_control_plane.yml: systemd_units.yaml needs the master facts
| * | upgrade_control_plane.yml: systemd_units.yaml nees the master factsMark Chappell2016-12-021-0/+1
| | |
* | | Merge pull request #2907 from tremble/masterAndrew Butcher2016-12-022-2/+2
|\ \ \ | |/ / |/| | openshift-master/restart : use openshift.common.hostname instead of inventory_hostname
| * | openshift-master/restart : use openshift.common.hostname instead of ↵Mark Chappell2016-12-022-2/+2
|/ / | | | | | | | | | | | | inventory_hostname When using a dynamic inventory inventory_hostname isn't guaranteed to be usable. We should use openshift.common.hostname which already copes with this
* | Merge pull request #2888 from sdodson/dnsmasq-no-strict-orderScott Dodson2016-12-014-4/+4
|\ \ | | | | | | openshift_node_dnsmasq - Remove strict-order option from dnsmasq
| * | openshift_node_dnsmasq - Remove strict-order option from dnsmasqScott Dodson2016-12-014-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strict-order forces dnsmasq to iterate through nameservers in order. If one of the nameservers is down this will slow things down while dnsmasq waits for a timeout. Also, this option prevents dnsmasq from querying other nameservers if the first one returns a negative result. While I think it's odd to have a nameserver that returns negative results for a query that another returns positive results for this does seem to fix the issue in testing. Fixes Bug 1399577
* | | Merge pull request #2898 from smunilla/GH2738_misconfigured_etcd_varScott Dodson2016-12-011-0/+2
|\ \ \ | |_|/ |/| | Explictly set etcd vars for byo scaleup
| * | Explictly set etcd vars for byo scaleupSamuel Munilla2016-11-301-0/+2
|/ / | | | | | | Fixes #2738
* | Merge pull request #2859 from dgoodwin/ovs-docker-restartScott Dodson2016-11-308-41/+73
|\ \ | | | | | | Cleanup ovs file and restart docker on every upgrade.
| * | Cleanup ovs file and restart docker on every upgrade.Devan Goodwin2016-11-308-41/+73
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 3.3 one of our services lays down a systemd drop-in for configuring Docker networking to use lbr0. In 3.4, this has been changed but the file must be cleaned up manually by us. However, after removing the file docker requires a restart. This had big implications particularly in containerized environments where upgrade is a very fragile series of upgrading and service restarts. To avoid double docker restarts, and thus double service restarts in containerized environments, this change does the following: - Skip restart during docker upgrade, if it is required. We will restart on our own later. - Skip containerized service restarts when we upgrade the services themselves. - Clean shutdown of all containerized services. - Restart Docker. (always, previously this only happened if it needed an upgrade) - Ensure all containerized services are restarted. - Restart rpm node services. (always) - Mark node schedulable again. At the end of this process, docker0 should be back on the system.
* | Merge pull request #2887 from sdodson/image-stream-syncScott Dodson2016-11-3021-190/+434
|\ \ | |/ |/| Sync latest image stream and templates for v1.3 and v1.4
| * Sync latest image stream and templates for v1.3 and v1.4Scott Dodson2016-11-3021-190/+434
|/
* Merge pull request #2882 from sjenning/allow-latest-image-tagScott Dodson2016-11-291-1/+1
|\ | | | | allow 'latest' origin_image_tag
| * allow 'latest' origin_image_tagSeth Jennings2016-11-291-1/+1
| |
* | Merge pull request #2884 from sdodson/image-stream-syncScott Dodson2016-11-2910-25/+3689
|\ \ | | | | | | xpaas v1.3.5
| * | xpaas v1.3.5Scott Dodson2016-11-2910-25/+3689
| | |
* | | Merge pull request #2855 from detiber/updateSchedulerDefaultsScott Dodson2016-11-2942-265/+859
|\ \ \ | | | | | | | | Update scheduler defaults
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:58:37 +0000