summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-26Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memoryOpenShift Merge Robot
Automatic merge from submit-queue logging: fix kibana and kibana-ops defaults - move kibana-ops defaults to `openshift_logging_kibana` role - set kibana-ops memory limit to 256Mi to match kibana memory limit **additional steps:** - [ ] backport to 3.6 - [ ] backport to 3.5 - [x] wait for PR #5176 to merge and rebase cc: @jcantrill
2017-09-27Automatic commit of package [openshift-ansible] release [3.7.0-0.132.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5470 from ingvagabund/consolidate-etcd-common-roleOpenShift Merge Robot
Automatic merge from submit-queue Consolidate etcd common role The last PR toward a single etcd role
2017-09-26Merge pull request #5536 from ingvagabund/make-difference-output-list-3.7OpenShift Merge Robot
Automatic merge from submit-queue make difference filter output a list for Python3 Fixes: #3934
2017-09-26Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot
Automatic merge from submit-queue Fluentd: one output tag, one output plugin (origin-aggregated-logging)
2017-09-26Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot
Automatic merge from submit-queue Updating to check for netnamespace kube-service-catalog to be ready When we are using the sdn multitentant plugin we need to wait for the netnamespace to be ready before we can make it a global project Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1487959
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.131.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot
Automatic merge from submit-queue Generate aggregator api client config in temporary directory. The `run_once`'s probably aren't necessary since the role is ran serially.
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.130.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot
Automatic merge from submit-queue Passing in image parameter for tsb template CC @jim-minter @deads2k @bparees
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.129.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot
Automatic merge from submit-queue Refactor openshift_hosted plays and role (version 2) Currently, openshift_hosted role duplicates some logic across separate task chains. This commit cleans up the openshift_hosted role and converts it to be primarily used with include_role to give better logic to the playbooks that utilize this role. This commit also refactors the playbook that calls various openshift_hosted roles into individual playbooks. This allows more granularity for advanced users. ----- This version of the patch set rolls back some of the refactoring (removal of running fact roles as a dependency) and focuses on just realigning the roles and plays. Original PR: https://github.com/openshift/openshift-ansible/pull/5284 Once this merges, I will close the old PR. Leaving it open for now for reference.
2017-09-26Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot
Automatic merge from submit-queue Remove logging ES_COPY feature This PR removes the ES_COPY feature that has been deprecated since 3.3
2017-09-26make difference filter output a list for Python3Jan Chaloupka
2017-09-26Automatic commit of package [openshift-ansible] release [3.7.0-0.128.0].Jenkins CD Merge Bot
Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
2017-09-26Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot
Automatic merge from submit-queue Detect the proper version of the images when using CRI-O Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357
2017-09-25Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz
2017-09-25Merge pull request #5520 from ingvagabund/check-etcd-storage-backendOpenShift Merge Robot
Automatic merge from submit-queue check if the storage backend is set to etcd3 before upgrading to 3.7 SSIA
2017-09-25Generate aggregator api client config in temporary directory.Andrew Butcher
2017-09-25Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot
Automatic merge from submit-queue Changes for Nuage atomic ansible install
2017-09-25consolidate etcd_common roleJan Chaloupka
2017-09-25Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot
Automatic merge from submit-queue Move additional/block/insecure registires to /etc/containers/... Move additional/block/insecure registires to /etc/containers/registries.conf This commit moves additional/block/insecure registries to /etc/containers/registries.conf and comments existing lines in /etc/sysconfig/docker. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460930
2017-09-25Passing in image parameter for tsb templateEric Wolinetz
2017-09-25Fluentd: one output tag, one output pluginNoriko Hosoi
Adding <label @OUTPUT> to fluent.conf.
2017-09-25Merge pull request #5415 from ttindell2/masterOpenShift Merge Robot
Automatic merge from submit-queue #5362 GlusterFS fails to run more than once #5362 Added the ability to have the GlusterFS ansible script run more than once. It also allows to update the topology of the Gluster cluster even if the Gluster cluster has already been deployed. @dustymabe
2017-09-25Merge pull request #5451 from ingvagabund/consolidate-etcd-upgradeOpenShift Merge Robot
Automatic merge from submit-queue Consolidate etcd upgrade Consolidates `etcd_upgrade` into the `etcd` role.
2017-09-25logging: fix kibana and kibana-ops defaultsJan Wozniak
2017-09-25Refactor openshift_hosted plays and roleMichael Gugino
Currently, openshift_hosted role duplicates some logic across separate task chains. This commit cleans up the openshift_hosted role and converts it to be primarily used with include_role to give better logic to the playbooks that utilize this role. This commit also refactors the playbook that calls various openshift_hosted roles into individual playbooks. This allows more granularity for advanced users.
2017-09-25check if the storage backend is set to etcd3 before upgrading to 3.7Jan Chaloupka
2017-09-25Merge pull request #5492 from jsafrane/local-storage-predicateOpenShift Merge Robot
Automatic merge from submit-queue Add 3.7 scheduler predicates In 3.7 we added NoVolumeNodeConflict and MaxAzureDiskVolumeCount predicate that needs to be installed. Check carefully, I tested it on my virtual machine, but I did not manage to run the test.
2017-09-25crio: detect the correct version of the imagesGiuseppe Scrivano
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-25Merge pull request #5513 from lucastheisen/masterOpenShift Merge Robot
Automatic merge from submit-queue resolve #5428: python-dbus not found `python-dbus` is not available in centos standard repos, but: > It appears python-dbus is just a reference to dbus-python and `dbus-python` is.
2017-09-25crio: set the correct image name with OSEGiuseppe Scrivano
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-24Merge pull request #5475 from adammhaile/masterOpenShift Merge Robot
Automatic merge from submit-queue Use 3.7 RPM repo
2017-09-24Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot
Automatic merge from submit-queue crio: skip installation on lbs and nfs nodes Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494461 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2017-09-24Merge pull request #5499 from mtnbikenc/remove-default-callbackOpenShift Merge Robot
Automatic merge from submit-queue Remove override default.py callback plugin The functionality of this plugin has been added to Ansible as the [debug.py](https://github.com/ansible/ansible/blob/devel/lib/ansible/plugins/callback/debug.py) callback plugin. The Ansible default plugin has added a significant amount of functionality as well as updates to the CallbackBase class. When developing new plugins for OpenShift-Ansible this override can result in [unexpected](https://github.com/ansible/ansible/issues/27151) behavior. This plugin was originally added in #1861.
2017-09-24Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fixOpenShift Merge Robot
Automatic merge from submit-queue Fixed AnsibleUnsafeText by converting to int Related to https://github.com/openshift/openshift-ansible/pull/5067 I've tested with custom values and it failed. This fixes the issue in my tests. ``` [cloud-user@bastion ~]$ grep -E 'osm|portal' /etc/ansible/hosts osm_default_node_selector="role=app" osm_use_cockpit=true osm_cluster_network_cidr=10.130.0.0/14 osm_host_subnet_length=8 openshift_portal_net=10.111.0.0/16 ``` After the installation: ``` [root@master-0 ~]# alias oetcdctl='etcdctl --cert-file=/etc/etcd/peer.crt --key-file=/etc/etcd/peer.key --ca-file=/etc/etcd/ca.crt --peers="https://master-0.edu.flannel.com:2379,https://master-1.edu.flannel.com:2379,https://master-2.edu.flannel.com:2379"' [root@master-0 ~]# oetcdctl get /openshift.com/network/config { "Network": "10.130.0.0/14", "SubnetLen": 24, "Backend": { "Type": "host-gw" } } ``` But, the subnets assigned to the nodes are on different subnet: ``` [root@master-0 ~]# oetcdctl ls /openshift.com/network/subnets /openshift.com/network/subnets/10.128.83.0-24 /openshift.com/network/subnets/10.128.18.0-24 /openshift.com/network/subnets/10.128.77.0-24 /openshift.com/network/subnets/10.128.101.0-24 /openshift.com/network/subnets/10.128.20.0-24 /openshift.com/network/subnets/10.128.92.0-24 /openshift.com/network/subnets/10.128.58.0-24 /openshift.com/network/subnets/10.128.48.0-24 ```
2017-09-24Merge pull request #5495 from abutcher/ca-redeploy-expired-etcdOpenShift Merge Robot
Automatic merge from submit-queue Improve CA redeploy restart logic Expired etcd certificates require special casing around restarts in the certificate redeploy playbooks. When etcd certificates are expired we can't restart masters or nodes. We also can't simply restart etcd because peers also had expired certificates so we must start/stop etcd when we detect expired etcd certificates. `openshift-ca.yml`: * No longer restart master services when etcd certificates were previously expired. * No longer restart node services when master or etcd certificates were previously expired. `etcd-ca.yml`: * No longer restart master services when etcd certificates were previously expired. Tested using [gen_expired_tls.sh](https://gist.github.com/abutcher/bdd20b9d582675d89fb22658689c49e4) on one of my master/etcd hosts to ensure that restart logic changes caused us to skip the right restarts and do a full start/stop of etcd in the `redeploy-certificates.yml` and `redeploy-etcd-certificates.yml` playbooks. Note: When this happens with a cluster and you want to replace all certificates, you can run: `redeploy-etcd-ca.yml`, `redeploy-openshift-ca.yml` (which will both skip restarts) and then run `redeploy-certificates.yml` which will now be able to full/stop start etcd.
2017-09-23Merge pull request #5507 from abutcher/etcd-scaleup-urlsOpenShift Merge Robot
Automatic merge from submit-queue Set master facts prior to adding new etcd client urls to master config. `openshift_master` role dependencies were moved out of the role in https://github.com/openshift/openshift-ansible/pull/5392 so we need to call `openshift_master_facts` prior to patching the master config in etcd scaleup. https://bugzilla.redhat.com/show_bug.cgi?id=1490304
2017-09-23Merge pull request #5502 from mgugino-upstream-stage/fix-undefined-reg-authOpenShift Merge Robot
Automatic merge from submit-queue Fix registry_auth logic for upgrades Currently, the logic for registry authentication is not implemented correctly to account for upgrades of containerized hosts. Additionally, the logic to account for multiple runs of openshift-ansible might cause registry authentication credentials to not be mounted inside of containerized hosts. This commit adds the necessary logic to ensure containerized hosts retain registry credentials. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1494470
2017-09-23Merge pull request #5460 from ingvagabund/consolidate-etcd-migrate-roleOpenShift Merge Robot
Automatic merge from submit-queue Consolidate etcd migrate role The PR is based on top of https://github.com/openshift/openshift-ansible/pull/5371 and https://github.com/openshift/openshift-ansible/pull/5451. Once both PRs are merged, I will rebase.
2017-09-23resolve #5428: python-dbus not foundLucas Theisen
2017-09-23Merge pull request #5413 from ingvagabund/disable-excluders-after-pre-checksOpenShift Merge Robot
Automatic merge from submit-queue Move some pre-checks before excluders are disabled Some pre-checks needs an OCP version which is detected by a set of tasks that need the excluders to be disabled. So at the best I can move some pre-checks before the excluders are disabled. However, there will be still some checks that can fail with excluders updated to the newer version. Bug: 1484304
2017-09-23Merge pull request #5384 from joelddiaz/node-fact-filterOpenShift Merge Robot
Automatic merge from submit-queue move (and rename) get_dns_ip filter into openshift_node_facts Due to recent changes to filter_plugins/openshift_node.py, when trying to run a current version of the openshift_node_facts role on a system with an older version of the openshift-ansible-filter-plugins RPM, the new role will fail. ``` File "/usr/share/ansible_plugins/filter_plugins/openshift_node.py", line 30, in get_dns_ip if bool(hostvars['openshift']['common']['use_dnsmasq']): KeyError: 'use_dnsmasq' ``` It's not possible for us to have our current RPM version (presently openshift-ansible-filter-plugins-3.5.120-1.git.0.c60f69a.el7.noarch) and a newer RPM installed and run both current openshift-ansible code and older checked-out/vendored releases (for older clusters/releases). Since only the openshift_node_facts role uses the get_dns_ip filter, move the functionality into a role-specific filter plugin. In addition, rename the filter plugin to 'node_get_dns_ip' because Ansible is preffering the get_dns_ip from the RPM (ie /usr/share/ansible_plugins/filter_plugins/openshift_node.py) over the role-specific filter plugin of the same name. Ansile prefers the filter plugins in /usr/share/ansible_plugins/filter_plugins/* even when /etc/ansible/ansible.cfg is set to something like: filter_plugins = filter_plugins:/usr/share/ansible_plugins/filter_plugins:filter_plugins <--- yes, 'filter_plugins' before and after /usr/share/ansible_plugins/filter_plugins (ansible 2.3.1.0) (perhaps this is because the /usr/share/ansible/plugins/filter symlink to /usr/share/ansible_plugins/filter_plugins takes precedence over everything???) Renaming the filter plugin function ensures that versions of the openshift_node_facts role that depend on the old implementation can continue to use it through what the older RPM provides, and the new role can use it's role-specific filter plugin without any variable namespace collisions. Lastly, remove filter_plugins/openshift_node.py since it is now self-contained in roles/openshift_node_facts. https://bugzilla.redhat.com/show_bug.cgi?id=1494312
2017-09-22Merge pull request #5491 from sosiouxme/20170920-diagnostics-checkOpenShift Merge Robot
Automatic merge from submit-queue health checks: add diagnostics check Adds a health check that runs `oc adm diagnostics` with each individual diagnostic. Also, moved `is_first_master` method into superclass for reuse. And look at `oo_first_master` and `ansible_host` instead of `masters` and `ansible_ssh_host`.
2017-09-22Merge pull request #5483 from sdodson/bz1396350OpenShift Merge Robot
Automatic merge from submit-queue Ensure that hostname is lowercase Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
2017-09-22Merge pull request #5511 from ewolinetz/logging_metrics_default_fixScott Dodson
Updating default behavior for installing metrics and logging. Separat…
2017-09-22Merge pull request #5496 from mgugino-upstream-stage/remove-hosted-loggingOpenShift Merge Robot
Automatic merge from submit-queue Remove unused openshift_hosted_logging role This role has not been used for several releases. It is not tested by an checks, and no meaningful updates have been made to this role in several months.
2017-09-22Merge pull request #5498 from mgugino-upstream-stage/fedora-pyyamlScott Dodson
Add python3-PyYAML for Fedora installs
2017-09-22Updating default behavior for installing metrics and logging. Separating out ↵Eric Wolinetz
uninstall to own variable
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-03 17:51:03 +0000