summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5358 from wozniakjan/logging_kibana_ops/default_memoryOpenShift Merge Robot2017-09-261-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * logging: fix kibana and kibana-ops defaultsJan Wozniak2017-09-251-2/+2
| |
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.132.0].Jenkins CD Merge Bot2017-09-272-2/+9
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #5470 from ingvagabund/consolidate-etcd-common-roleOpenShift Merge Robot2017-09-2640-323/+272
|\ \ | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Consolidate etcd common role The last PR toward a single etcd role
| * | consolidate etcd_common roleJan Chaloupka2017-09-2540-323/+272
| | |
* | | Merge pull request #5536 from ingvagabund/make-difference-output-list-3.7OpenShift Merge Robot2017-09-263-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue make difference filter output a list for Python3 Fixes: #3934
| * | | make difference filter output a list for Python3Jan Chaloupka2017-09-263-5/+5
| | | |
* | | | Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot2017-09-262-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Fluentd: one output tag, one output plugin (origin-aggregated-logging)
| * | | | Fluentd: one output tag, one output pluginNoriko Hosoi2017-09-252-0/+4
| | | | | | | | | | | | | | | | | | | | Adding <label @OUTPUT> to fluent.conf.
* | | | | Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot2017-09-261-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz2017-09-251-4/+16
| | |_|/ / | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.131.0].Jenkins CD Merge Bot2017-09-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot2017-09-261-11/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Generate aggregator api client config in temporary directory.Andrew Butcher2017-09-251-11/+29
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.130.0].Jenkins CD Merge Bot2017-09-262-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot2017-09-263-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Passing in image parameter for tsb template CC @jim-minter @deads2k @bparees
| * | | | | | Passing in image parameter for tsb templateEric Wolinetz2017-09-253-4/+10
| | |/ / / / | |/| | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.129.0].Jenkins CD Merge Bot2017-09-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot2017-09-2629-236/+239
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Refactor openshift_hosted plays and roleMichael Gugino2017-09-2529-236/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot2017-09-265-6/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Remove logging ES_COPY feature This PR removes the ES_COPY feature that has been deprecated since 3.3
| * | | | | | Remove logging ES_COPY featureJeff Cantrill2017-09-225-6/+3
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.128.0].Jenkins CD Merge Bot2017-09-262-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot2017-09-262-5/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | crio: detect the correct version of the imagesGiuseppe Scrivano2017-09-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494357 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | crio: set the correct image name with OSEGiuseppe Scrivano2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | Merge pull request #5520 from ingvagabund/check-etcd-storage-backendOpenShift Merge Robot2017-09-252-0/+26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue check if the storage backend is set to etcd3 before upgrading to 3.7 SSIA
| * | | | | | | check if the storage backend is set to etcd3 before upgrading to 3.7Jan Chaloupka2017-09-252-0/+26
| |/ / / / / /
* | | | | | | Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot2017-09-254-19/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Changes for Nuage atomic ansible install
| * | | | | | | Changes for Nuage atomic ansible installRohan Parulekar2017-09-204-19/+5
| | | | | | | |
* | | | | | | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot2017-09-255-11/+71
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-215-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge pull request #5415 from ttindell2/masterOpenShift Merge Robot2017-09-254-39/+48
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | GlusterFS can now be run more than once. Ability to add devices to nodesTim Tindell2017-09-184-39/+48
| | | | | | | |
* | | | | | | | Merge pull request #5451 from ingvagabund/consolidate-etcd-upgradeOpenShift Merge Robot2017-09-2513-64/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Consolidate etcd upgrade Consolidates `etcd_upgrade` into the `etcd` role.
| * | | | | | | consolidate etcd_upgrade roleJan Chaloupka2017-09-2113-64/+36
| | | | | | | |
* | | | | | | | Merge pull request #5492 from jsafrane/local-storage-predicateOpenShift Merge Robot2017-09-252-1/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Add 3.7 scheduler predicatesJan Safranek2017-09-202-1/+32
| |/ / / / / /
* | | | | | | Merge pull request #5513 from lucastheisen/masterOpenShift Merge Robot2017-09-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | resolve #5428: python-dbus not foundLucas Theisen2017-09-231-1/+1
| | | | | | |
* | | | | | | Merge pull request #5475 from adammhaile/masterOpenShift Merge Robot2017-09-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue Use 3.7 RPM repo
| * | | | | | | Use 3.7 RPM repoAdam Haile2017-09-201-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot2017-09-241-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | crio: skip installation on lbs and nfs nodesGiuseppe Scrivano2017-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1494461 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | Merge pull request #5499 from mtnbikenc/remove-default-callbackOpenShift Merge Robot2017-09-241-70/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Remove override default.py callback pluginRussell Teague2017-09-221-70/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functionality of this plugin has been added to Ansible as the debug.py callback plugin.
* | | | | | | | | | Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fixOpenShift Merge Robot2017-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
| * | | | | | | | | | Fixed AnsibleUnsafeText by converting to intEduardo Minguez2017-09-211-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5495 from abutcher/ca-redeploy-expired-etcdOpenShift Merge Robot2017-09-246-31/+100
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | Do a full stop/start when etcd certificates had expired.Andrew Butcher2017-09-214-0/+42
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 10:34:46 +0000