summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-10Merge pull request #5645 from jmencak/tuned-role-lbOpenShift Merge Robot
Automatic merge from submit-queue. Separate tuned daemon setup into a role. Also adding support for the loadbalancer. It is important to raise ARP cache limits on HA setups with loadbalancers serving 1k+ nodes.
2017-10-10Merge pull request #5585 from nak3/bz#1496593OpenShift Merge Robot
Automatic merge from submit-queue. Add valid search when search does not exist on resolv.conf Current fix https://github.com/openshift/openshift-ansible/pull/5433 still misses to add `search cluster.local`. The logic needs to be: 1. When `search` does not exist, adds `search cluster.local`. 2. When `search.*.cluster.local` does not exist, adds(sed) `cluster.local`. in this order. cc @sdodson @caruccio
2017-10-10Merge pull request #5711 from ↵Scott Dodson
giuseppe/docker-crio-expect-openshiftrelease-with-v crio, docker: expect openshift_release to have 'v'
2017-10-10Merge pull request #5713 from mtnbikenc/fix-inventoryScott Dodson
Fix typo in inventory example
2017-10-10Fix typo in inventory exampleRussell Teague
2017-10-10Separate tuned daemon setup into a role.Jiri Mencak
Currently, profiles for the tuned daemon are set only for OpenShift node(s). This excludes the OpenShift loadbalancer. As a result, ARP cache limits on loadbalancers are not raised. This causes problems with HA setups where loadbalancers serve 1k+ OpenShift nodes. This commit ensures the openshift-control-plane role is applied to loadbalancers, masters and OpenShift infra nodes. Regular OpenShift worker nodes get the openshift-node profile. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1498213
2017-10-10crio, docker: expect openshift_release to have 'v'Giuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-10Automatic commit of package [openshift-ansible] release [3.7.0-0.147.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-09Merge pull request #5695 from giuseppe/image_tag_default_to_releaseOpenShift Merge Robot
Automatic merge from submit-queue. docker, CRI-O: openshift_image_tag defaults to openshift_release Replace: commit c2c4ba7ec62d4dfd87d746d20991e10f2bd1bddf Author: Giuseppe Scrivano <gscrivan@redhat.com> Date: Tue Sep 26 09:01:59 2017 +0200 Require openshift_image_tag in the inventory with openshift-enterprise Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> with using openshift_release for openshift_image_tag so we don't require users to include both in their inventory. Probably it is only a temporary solution until the openshift_image_tag vs openshift_release when using Docker/CRI-O is sorted out. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1493376
2017-10-09Merge pull request #5698 from abutcher/servinginfo-client-caOpenShift Merge Robot
Automatic merge from submit-queue. Bug 1493276: Setting servingInfo.clientCA to ca-bundle.crt can cause unwanted client cert popups in browser when hitting console https://bugzilla.redhat.com/show_bug.cgi?id=1493276
2017-10-09Merge pull request #5368 from jianlinliu/bz1490738Scott Dodson
Update registry_config.j2 to fix BZ#1490738
2017-10-09Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson
Add PartOf to docker systemd service unit.
2017-10-09Merge pull request #5699 from giuseppe/crio-use-systemdOpenShift Merge Robot
Automatic merge from submit-queue. crio: use systemd manager fix a regression introduced last week. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-09Add PartOf to docker systemd service unit.Michael Gugino
Currently, if iptables service is restarted, existing iptables rules are removed. Docker adds iptables rules dyanmically upon startup and container creation. Restarting the iptables service results in a loss of these needed iptables rules. This commit ensures that if iptables service is restarted by anisble or the user, docker is also restarted. This ensures the proper dynamic iptables rules are in place for docker. Fixes: openshift/origin#16709
2017-10-09Automatic commit of package [openshift-ansible] release [3.7.0-0.146.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-09Merge pull request #5650 from mgugino-upstream-stage/skopeo-auth-credsOpenShift Merge Robot
Automatic merge from submit-queue. Add authentication credentials to skopeo for image check Currently, docker_image_availability health_check does not support authenticated registries. This commit adds the '--creds=' option to skopeo if needed to support authentication credentials. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
2017-10-09crio: use systemd managerGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-09Merge pull request #5682 from tbielawa/openshift_managementScott Dodson
Rename openshift_cfme role to openshift_management
2017-10-09Ensure servingInfo.clientCA is set as ca.crt rather than ca-bundle.crt.Andrew Butcher
2017-10-09Automatic commit of package [openshift-ansible] release [3.7.0-0.145.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-09Merge pull request #5696 from ingvagabund/add-missing-handler-to-flannelJan Chaloupka
add missing restart node handler to flannel
2017-10-09add missing restart node handler to flannelJan Chaloupka
2017-10-09crio, docker: use openshift_release when openshift_image_tag is not usedGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-09crio: fix typoGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-07Merge pull request #5684 from enj/enj/i/configmap_lockOpenShift Merge Robot
Automatic merge from submit-queue. Switch to configmap leader election on 3.7 upgrade This change sets the controllerConfig.election.lockName to openshift-master-controllers on a 3.7 upgrade. This is the default in a new 3.7 cluster. Important excerpt from the docs inside the origin codebase (slightly modified): There are two modes for lease operation - a legacy mode that directly connects to etcd, and the preferred mode which coordinates on a configmap or endpoint in the kube-system namespace. Because legacy mode and the new mode do not coordinate on the same key, an upgrade must stop all controllers before changing the configuration and starting controllers with the new config. Signed-off-by: Monis Khan <mkhan@redhat.com> /assign @smarterclayton @jupierce /kind bug
2017-10-07Merge pull request #5661 from giuseppe/crio-use-overlay-instead-of-overlay2OpenShift Merge Robot
Automatic merge from submit-queue. cri-o: use overlay instead of overlay2 overlay2 and overlay are the same driver. Upstream CRI-O is going to drop any reference to overlay2 and use only overlay. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-06docker_image_availability: credentials to skopeoMichael Gugino
Currently, docker_image_availability health_check does not support authenticated registries. This commit adds the '--creds=' option to skopeo if needed to support authentication credentials. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341 Some other fixes to handle docker config better: Should now account properly for blocked registries, insecure registries, multiple additional registries, and oreg_url registry with or without credentials. Output on failure should be clearer about what was tried. Fixed a bug in the action_plugin_test exposed by these changes.
2017-10-06Merge pull request #5680 from ↵OpenShift Merge Robot
mgugino-upstream-stage/ensure-docker-restarts-with-iptables Automatic merge from submit-queue. Ensure docker is restarted when iptables is restarted Currently, os_firewall role may run after docker role, and iptables.service may be restarted. When restarted, this negatively impacts docker's iptables rules. This commit ensures that if iptables is restarted, docker is restarted as well (by systemd) Fixes: https://github.com/openshift/origin/issues/16709
2017-10-06Rename openshift_cfme role to openshift_managementTim Bielawa
2017-10-06Switch to configmap leader election on 3.7 upgradeMonis Khan
This change sets the controllerConfig.election.lockName to openshift-master-controllers on a 3.7 upgrade. This is the default in a new 3.7 cluster. Important excerpt from the docs inside the origin codebase (slightly modified): There are two modes for lease operation - a legacy mode that directly connects to etcd, and the preferred mode which coordinates on a configmap or endpoint in the kube-system namespace. Because legacy mode and the new mode do not coordinate on the same key, an upgrade must stop all controllers before changing the configuration and starting controllers with the new config. Signed-off-by: Monis Khan <mkhan@redhat.com>
2017-10-06crio.conf.j2: sync from upstreamGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-06cri-o: use overlay instead of overlay2Giuseppe Scrivano
overlay2 and overlay are the same driver. Upstream CRI-O is going to drop any reference to overlay2 and use only overlay. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-10-06Ensure docker is restarted when iptables is restartedMichael Gugino
Currently, os_firewall role may run after docker role, and iptables.service may be restarted. When restarted, this negatively impacts docker's iptables rules. This commit ensures that if iptables is restarted, docker is restarted as well (by systemd) Fixes: https://github.com/openshift/origin/issues/16709
2017-10-06Merge pull request #5660 from sdodson/one-exampleScott Dodson
Stop including origin and ose hosts example file
2017-10-06Stop including origin and ose hosts example fileScott Dodson
It's a pain keeping these two in sync so just mention the differences as necessary.
2017-10-06Merge pull request #4820 from dcbw/revert-change-requires-to-wants-openvswitchOpenShift Merge Robot
Automatic merge from submit-queue. node: make node service PartOf=openvswitch.service when openshift-sdn is used This reverts commit 7f805f9a0c41477365dd88b0ac73f0d221bd654a. The commit causes the behavior seen in https://bugzilla.redhat.com/show_bug.cgi?id=1453113 because openshift-node is no longer restarted when openvswitch is. @giuseppe @sdodson @knobunc RE https://github.com/openshift/openshift-ansible/pull/4213 can we get a more detailed explanation of why the various dependencies are not being restarted correctly?
2017-10-06Automatic commit of package [openshift-ansible] release [3.7.0-0.144.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-10-05Merge pull request #5679 from mgugino-upstream-stage/fix-etcd-typoScott Dodson
fix typo for default in etcd
2017-10-05fix typo for default in etcdMichael Gugino
2017-10-05node: make node service PartOf=openvswitch.service when openshift-sdn is usedDan Williams
Commit 7f805f9a0c41477365dd88b0ac73f0d221bd654a causes the behavior seen in https://bugzilla.redhat.com/show_bug.cgi?id=1453113 because openshift-node is no longer restarted when openvswitch is, due to the change from Requires to Wants. Turns out that making the openshift node service PartOf the OVS service can achieve the same result and ensure openshift-node gets restarted whenever OVS does, which ensures that networking doesn't break underneath the node. Suggested by Giuseppe Scrivano
2017-10-05Merge pull request #5673 from ewolinetz/bz1497041Scott Dodson
Bumping version of service catalog image for 3.7
2017-10-05Merge pull request #5336 from tbielawa/cfme_4.6OpenShift Merge Robot
Automatic merge from submit-queue. Cfme 4.6 # Description * Implements support for **CFME 4.6** in OCP 3.7 * **Replaces** the Tech Preview CFME 4.5 release included in OCP 3.6 * Does not support graceful migrations from the CFME 4.5 tech preview release # References * [Trello - (5) Integrate CFME 4.6 into OCP Installation](https://trello.com/c/Rzfn5Qa8/380-5-integrate-cfme-46-into-ocp-installation) Ensure the following RFE/Errors do not happen again - [x] #4555 - Error creating the CFME user - [x] #4556 - Error in PV template evaluation - [x] #4822 - Changing `maxImagesBulkImportedPerRepository` parameter - [x] #4568 - Add NFS directory support # Features Ensure the following features are configurable in the role - [x] POC deployments can easily default to NFS storage - [ ] Production/Cloud deployments can use automatic storage providers - [ ] Able to select between podified vs. external PostgreSQL database (podified uses configured storage mechanism) - [x] Template resource requests can be overridden for POC deployments
2017-10-05Merge pull request #5644 from etsauer/installer-image-directory-supportScott Dodson
Adding support for an inventory directory/hybrid inventory
2017-10-05Bumping version of service catalog image for 3.7Eric Wolinetz
2017-10-05Merge pull request #5605 from mgugino-upstream-stage/build-provision-splitOpenShift Merge Robot
Automatic merge from submit-queue. Build provision split Make provisioning steps more reusable Reorganizing and making some of the plays more reusable. Depends-on: https://github.com/openshift/openshift-ansible/pull/5565
2017-10-05Merge pull request #5637 from wozniakjan/1496271_fixOpenShift Merge Robot
Automatic merge from submit-queue. Bug 1496271 - Perserve SCC for ES local persistent storage ES can be modified to use node local persistent storage. This requires changing SCC and is described in docs: https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html During an upgrade, SCC defined by the user is ignored. This fix fetches SCC user defined as a fact and adds it to the ES DC which is later used. Also includes cherrypicked fix for - Bug 1482661 - Preserve ES dc nodeSelector and supplementalGroups cc @jcantrill
2017-10-05Merge pull request #5658 from sosiouxme/20171004-groups-for-checksOpenShift Merge Robot
Automatic merge from submit-queue. nfs, lb, and groups for checks Checks have been using the byo group names for determining whether they need to be active or not. Now that everything is running through common initialization, stop assuming byo names and start referring to the common ones. As a follow-on [bugfix](https://bugzilla.redhat.com/show_bug.cgi?id=1496760), run docker checks only where docker will be: nodes, and containerized master/etcd. We specifically don't want to run against lb or nfs, but a whitelist approach is used.
2017-10-05Merge pull request #5564 from jcantrill/es_promOpenShift Merge Robot
Automatic merge from submit-queue. Add logging es prometheus endpoint This PR adds changes to add a prometheus endpoint to the logging elasticsearch pod
2017-10-04Merge pull request #5616 from ↵OpenShift Merge Robot
wozniakjan/logging/elasticsearch/honor_es_cpu_settings Automatic merge from submit-queue. logging: honor openshift_logging_es_cpu_limit PR https://github.com/openshift/openshift-ansible/pull/3509 has removed any usage of `openshift_logging_es_cpu_limit`. Currently, the `openshift_logging_elasticsearch_cpu_limit` is either default '1000m' or derived from `openshift_logging_es_ops_cpu_limit` but if user sets the `openshift_logging_es_cpu_limit` in the inventory as documented, its value is ignored. This PR fixes the issue by setting `openshift_logging_elasticsearch_cpu_limit=openshift_logging_es_cpu_limit` and when the role is included as -ops, it overrides this setting with `openshift_logging_es_ops_cpu_limit`.
2017-10-04Merge pull request #5636 from ↵OpenShift Merge Robot
mgugino-upstream-stage/limit-openshift-version-hosts Automatic merge from submit-queue. Limit hosts that run openshift_version role Currently, the openshift_version role is run against the oo_all_hosts group. This causes the dependencies, such as openshift_docker and docker, to be run against host groups that were not intended, such as nfs. This commit explicitly limits the openshift_version role to run only against masters, nodes, and etcd host groups. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1497144
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-11 15:08:55 +0000