summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | refactor handling of scheduler defaultsJason DeTiberus2016-11-298-39/+579
| | | |
| * | | update tests and flake8/pylint fixesJason DeTiberus2016-11-2932-225/+266
| | | |
| * | | fix taggingJason DeTiberus2016-11-291-0/+2
| | | |
| * | | do not report changed for group mappingJason DeTiberus2016-11-292-1/+12
| | | |
* | | | Merge pull request #2883 from tbielawa/update-ansible-ver-checkJason DeTiberus2016-11-291-3/+3
|\ \ \ \ | |_|/ / |/| | | Ansible version check update
| * | | Ansible version check updateTim Bielawa2016-11-291-3/+3
|/ / / | | | | | | | | | | | | We require ansible >= 2.2.0 now. Updating version checking playbook to reflect this change.
* | | Merge pull request #2880 from mtnbikenc/docker-dupJason DeTiberus2016-11-291-1/+0
|\ \ \ | |_|/ |/| | Remove duplicate when key
| * | Remove duplicate when keyRussell Teague2016-11-291-1/+0
| |/
* | Merge pull request #2831 from dgoodwin/upgrade-orderingScott Dodson2016-11-292-4/+4
|\ \ | | | | | | Fix rare failure to deploy new registry/router after upgrade.
| * | Fix rare failure to deploy new registry/router after upgrade.Devan Goodwin2016-11-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Router/registry update and re-deploy was recently reordered to immediately follow control plane upgrade, right before we proceed to node upgrade. In some situations (small or single host clusters) it appears possible that the deployer pods are running when the node in question is evacuated for upgrade. When the deployer pod dies the deployment is failed and the router/registry continue running the old version, despite the deployment config being updated correctly. This change re-orderes the router/registry upgrade to follow node upgrade. However for separate control plane upgrade, the router/registry still occurs at the end. This is because router/registry seems like they should logically be included in a control plane upgrade, and presumably the user will not manually launch node upgrade so quickly as to trigger an evac on the node in question. Workaround for this problem when it does occur is simply to: oc deploy docker-registry --latest
* | | Merge pull request #2853 from alexcern/dhcpv6Scott Dodson2016-11-291-1/+1
|\ \ \ | | | | | | | | Set nameservers on DHCPv6 event
| * | | Set nameservers on DHCPv6 eventAlex Lossent2016-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A dhcp6-change event may happen on nodes running dual stack IPv4/IPv6 and DHCP, even if Openshift itself doesn't use IPv6. /etc/resolv.conf needs be adjusted as well in this case.
* | | | Merge pull request #2876 from dustymabe/dusty-fix-etcd-selinuxScott Dodson2016-11-291-1/+1
|\ \ \ \ | |_|_|/ |/| | | fix selinux issues with etcd container
| * | | fix selinux issues with etcd containerDusty Mabe2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that we don't relabel /etc/etcd/ (via `:z`) on every run. Doing this causes systemd to fail accessing /etc/etcd/etcd.conf when trying to run the systemd unit file on the next run. Convert it from `:z` to `:ro` since we only need read-only access to the files. Fixes #2811
* | | | Merge pull request #2868 from mtnbikenc/systemd-refactorJason DeTiberus2016-11-2956-189/+230
|\ \ \ \ | | | | | | | | | | Refactored to use Ansible systemd module
| * | | | Refactored to use Ansible systemd moduleRussell Teague2016-11-2856-189/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ansible systemd module used in place of service module * Refactored command tasks which are no longer necessary * Applying rules from openshift-ansible Best Practices Guide
* | | | | Merge pull request #2870 from mscherer/fix_2869Jason DeTiberus2016-11-291-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Gracefully handle OpenSSL module absence
| * | | | | Gracefully handle OpenSSL module absenceMichael Scherer2016-11-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Should fix #2869
* | | | | | Merge pull request #2874 from sdodson/etcd_embedded_upgradeScott Dodson2016-11-291-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | etcd upgrade playbook is not currently applicable to embedded etcd in…
| * | | | | etcd upgrade playbook is not currently applicable to embedded etcd installsScott Dodson2016-11-281-0/+3
|/ / / / / | | | | | | | | | | | | | | | Fixes Bug 1395945
* | | | | Merge pull request #2872 from dgoodwin/etcd-embedded-backupScott Dodson2016-11-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix invalid embedded etcd fact in etcd upgrade playbook.
| * | | | Fix invalid embedded etcd fact in etcd upgrade playbook.Devan Goodwin2016-11-281-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1398549 Was getting a different failure here complaining that openshift was not in the facts, as we had not loaded facts for the first master during playbook run. However this check was used recently in upgrade_control_plane and should be more reliable.
* | | | Merge pull request #2858 from ↵Jason DeTiberus2016-11-282-0/+13
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | lhuard1A/fix_list_after_create_on_libvirt_and_openstack Fix the list done after cluster creation on libvirt and OpenStack
| * | | Fix the list done after cluster creation on libvirt and OpenStackLénaïc Huard2016-11-242-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `list.yml` playbooks are using cloud provider specific variables to find the IPs of the VMs since 82449c6. Those “cloud provider specific” variables are the ones provided by the dynamic inventories. But there was a problem when the `list.yml` playbooks are invoked from the `launch.yml` ones because, in that case, the inventory is not coming from the dynamic inventory scripts, but from the `add_host` done inside `launch_instances.yml`. Whereas the GCE and AWS `launch_instances.yml` were correctly adding in the `add_host` the variables used by `list.yml`, libvirt and OpenStack were missing that. Fixes #2856
* | | Merge pull request #2865 from mtnbikenc/ansible-2.2-docsScott Dodson2016-11-285-5/+5
|\ \ \ | | | | | | | | Updating docs for Ansible 2.2 requirements
| * | | Updating docs for Ansible 2.2 requirementsRussell Teague2016-11-285-5/+5
| |/ /
* | | Merge pull request #2842 from mscherer/check_dbus_moduleScott Dodson2016-11-281-2/+10
|\ \ \ | | | | | | | | Verify the presence of dbus python binding
| * | | Verify the presence of dbus python bindingMichael Scherer2016-11-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | While the proper fix is to have it installed by default, this commit will also permit to have a better error message in the case the module is not present (as running on python 3)
* | | | Merge pull request #2836 from abutcher/BZ1393645Scott Dodson2016-11-287-26/+66
|\ \ \ \ | |_|/ / |/| | | Merge admission plugin configs
| * | | Merge kube_admission_plugin_config with admission_plugin_configSamuel Munilla2016-11-227-26/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the values in kube_admission_plugin_config up one level per the new format from 1.3: "The kubernetesMasterConfig.admissionConfig.pluginConfig should be moved and merged into admissionConfig.pluginConfig."
* | | | Merge pull request #2851 from mtnbikenc/os_firewall-fixJason DeTiberus2016-11-232-2/+2
|\ \ \ \ | | | | | | | | | | Systemd `systemctl show` workaround
| * | | | Systemd `systemctl show` workaroundRussell Teague2016-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `systemctl show` would exit with RC=1 for non-existent services in v231. This caused the Ansible systemd module to exit with a failure of running the `systemctl show` command instead of exiting stating the service was not found. This change catches both failures on either older or newer versions of systemd. The change in systemd exit status could be resolved in systemd v232. https://github.com/systemd/systemd/commit/3dced37b7c2c9a5c733817569d2bbbaa397adaf7
* | | | | Merge pull request #2846 from jfchevrette/patch-1Jason DeTiberus2016-11-221-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | Update README.md
| * | | | Update README.mdJean-Francois Chevrette2016-11-221-1/+3
|/ / / / | | | | | | | | add missing dependencies
* | | | Merge pull request #2845 from abutcher/fix-mixed-envJason DeTiberus2016-11-223-9/+9
|\ \ \ \ | | | | | | | | | | Fix issues encountered in mixed environments