summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4640 from ↵Scott Dodson2017-06-291-7/+16
|\ | | | | | | | | ingvagabund/fix-backup-and-workdir-dir-paths-for-etcd-system-container fix backup and working directory for etcd run as a system container
| * fix backup and working directory for etcd run as a system containerJan Chaloupka2017-06-291-7/+16
| |
* | Merge pull request #4642 from giuseppe/fix-upgrade-etcd-runc-nameScott Dodson2017-06-291-1/+1
|\ \ | | | | | | upgrade: fix name for the etcd system container
| * | upgrade: fix name for the etcd system containerGiuseppe Scrivano2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this error when running upgrade_etcd.yml: The conditional check 'etcd_container_version | default('99') | version_compare(etcd_upgrade_version,'<')' failed. The error was: Version comparison: LooseVersion instance has no attribute 'version' Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #4572 from sdodson/rhel_subscribe_remove_openshift_factsScott Dodson2017-06-292-4/+9
|\ \ \ | | | | | | | | Get rid of openshift_facts dep in rhel_subscribe
| * | | Get rid of openshift_facts dep in rhel_subscribeScott Dodson2017-06-232-4/+9
| | | | | | | | | | | | | | | | Because you can't install PyYAML before you subscribe
* | | | Merge pull request #4596 from steveteuber/patch-2Scott Dodson2017-06-291-1/+1
|\ \ \ \ | | | | | | | | | | Fix generate role binding destination for the HOSA service account
| * | | | Fix generate role binding destination for the HOSA service accountSteve Teuber2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | The task `Generate role binding for the hawkular-openshift-agent service account` use wrong template destination: https://github.com/openshift/openshift-ansible/blob/master/roles/openshift_metrics/tasks/install_metrics.yaml#L47
* | | | | Merge pull request #4645 from mtnbikenc/fix-version-checkScott Dodson2017-06-291-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Correct version comparisons to ensure proper fact evaluation
| * | | | | Correct version comparisons to ensure proper evaluationRussell Teague2017-06-291-6/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user supplies the openshift_image_tag inventory fact as '3.5', the evaluation of `version >= LooseVersion('3.5.0')` will return False. Changing the evaluation against only the X.X release will properly return True.
* | | | | Merge pull request #4643 from ewolinetz/metrics_local_becomeScott Dodson2017-06-293-0/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Adding become: false to local_action tasks
| * | | | Adding become: false to local_action tasksewolinetz2017-06-293-0/+7
|/ / / /
* | | | Merge pull request #4633 from ashcrow/pathScott Dodson2017-06-291-0/+3
|\ \ \ \ | |/ / / |/| | | etcd_migrate: Add /usr/local/bin to path for oadm
| * | | etcd_migrate: Add /var/usrlocal/bin to path for oadmSteve Milner2017-06-281-1/+1
| | | |
| * | | etcd_migrate: Add /usr/local/bin to path for oadmSteve Milner2017-06-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are cases where ansible may not keep the expected environment PATH. This change adds /usr/local/bin to the PATH on the oadm call. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1464010
* | | | Merge pull request #4451 from wozniakjan/logging_es_heap_dumpScott Dodson2017-06-291-0/+3
|\ \ \ \ | | | | | | | | | | logging: write ES heap dump to persistent storage
| * | | | logging: write ES heap dump to persistent storageJan Wozniak2017-06-141-0/+3
| | | | |
* | | | | Merge pull request #4618 from nhosoi/resource_limitsScott Dodson2017-06-292-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Sync environment variables FLUENTD/MUX_CPU_LIMIT FLUENTD/MUX_MEMORY_L…
| * | | | | Sync environment variables FLUENTD/MUX_CPU_LIMIT FLUENTD/MUX_MEMORY_LIMIT ↵Noriko Hosoi2017-06-272-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | with the resource limit values.
* | | | | | Merge pull request #4602 from abutcher/named-cert-redeployScott Dodson2017-06-292-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update master configuration for named certificates during master cert redeploy.
| * | | | | | Update master configuration for named certificates during master cert redeploy.Andrew Butcher2017-06-272-0/+31
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.128-1].Jenkins CD Merge Bot2017-06-292-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.128
* | | | | | | Merge pull request #4634 from fabianvf/asb-etcd-path-parameterScott Dodson2017-06-283-1/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Parameterize etcd binary path for ansible service broker
| * | | | | | parameterize etcd binary pathFabian von Feilitzsch2017-06-283-1/+4
|/ / / / / /
* | | | | | Merge pull request #4591 from richm/bug-1465168Scott Dodson2017-06-281-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Bug 1465168 - mux doesn't recognize ansible boolean parameters correctly
| * | | | | Bug 1465168 - mux doesn't recognize ansible boolean parameters correctlyRich Megginson2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1465168 The fix is to pass the value through the `lower` filter. The value is set in defaults/main.yaml so it should always have a value.
* | | | | | Merge pull request #4623 from ↵Scott Dodson2017-06-287-132/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/run-ttl-migration-only-one-on-the-first-master attach leases via the first master only and only once
| * | | | | | attach leases via the first master only and only onceJan Chaloupka2017-06-287-132/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move openshift-etcd/migrate.yml from byo to common and keep just the entry point - replace std_include with essential plays (e.g. no need to detect openshift version) - delegate the ttl re-attaching to the first master
* | | | | | | Merge pull request #4619 from ingvagabund/evaluate-groups-for-pure-etcd-upgradeScott Dodson2017-06-281-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [master] evalute groups when running etcd upgrade from byo/openshift-cluster/upgrades/upgrade_etcd.yml
| * | | | | | evalute groups when running etcd upgrade from ↵Jan Chaloupka2017-06-281-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | byo/openshift-cluster/upgrades/upgrade_etcd.yml
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.123.1003-1].Scott Dodson2017-06-272-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag
* | | | | | Merge pull request #4588 from giuseppe/router-look-for-ocScott Dodson2017-06-272-5/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | router/registry: look for the oc executable in /usr/local/bin and ~/bin
| * | | | | registry: look for the oc executable in /usr/local/bin and ~/binGiuseppe Scrivano2017-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | router: look for the oc executable in /usr/local/bin and ~/binGiuseppe Scrivano2017-06-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1463131 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #4605 from abutcher/loopback-named-caScott Dodson2017-06-272-20/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | Generate loopback kubeconfig separately to preserve OpenShift CA certificate.
| * | | | | | Generate loopback kubeconfig separately to preserve OpenShift CA certificate.Andrew Butcher2017-06-272-20/+41
| | | | | | |
* | | | | | | Merge pull request #4441 from sdodson/retry-docker-startupScott Dodson2017-06-271-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Retry docker startup once
| * | | | | | | Retry docker startup onceScott Dodson2017-06-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Large environments frequently see docker fail to start up after an upgrade. Not sure why but we can retry once.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.123.1002-1].Scott Dodson2017-06-272-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag
* | | | | | | | Merge pull request #4606 from DG-i/fluentd-typo-fixScott Dodson2017-06-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in fluentd_secureforward_contents variable
| * | | | | | | | Fix typo in fluentd_secureforward_contents variableAndreas Dembach2017-06-271-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #4601 from ewolinetz/fix_asb_quotesScott Dodson2017-06-271-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Reverting quotation change in ansible_service_broker install for etcd
| * | | | | | | Reverting quotation change in ansible_service_broker install for etcdewolinetz2017-06-271-2/+2
|/ / / / / / /
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.123.1001-1].Scott Dodson2017-06-262-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag
* | | | | | | Merge pull request #4534 from jarrpa/glusterfs-fixes-threeScott Dodson2017-06-263-6/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | GlusterFS: Various fixes 3
| * | | | | | GlusterFS: Use proper namespace for heketi command and service accountJose A. Rivera2017-06-212-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | GlusterFS: Fix heketi secret nameJose A. Rivera2017-06-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | Merge pull request #4569 from simon3z/empty-labelsScott Dodson2017-06-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use empty default for storage labels
| * | | | | | | openshift_logging: use empty default for storage labelsFederico Simoncelli2017-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
* | | | | | | | Merge pull request #4561 from sdodson/bz1464011Scott Dodson2017-06-261-20/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Set clean install and etcd storage on first master to fix scaleup