summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4978 from ewolinetz/bz1477440Scott Dodson2017-08-042-2/+2
|\ | | | | Fixing SA and clusterrole namespaces
| * Fixing SA and clusterrole namespacesewolinetz2017-08-022-2/+2
| |
* | Merge pull request #4964 from abutcher/py3-expiryOpenShift Bot2017-08-042-35/+15
|\ \ | | | | | | Merged by openshift-bot
| * | Paren wrap integration print().Andrew Butcher2017-08-011-1/+1
| | |
| * | Update openshift_cert_expiry for py3 support.Andrew Butcher2017-08-011-34/+14
| | |
* | | Merge pull request #4996 from jkaurredhat/installer-1.7Scott Dodson2017-08-041-1/+1
|\ \ \ | | | | | | | | Quick Installer should specify which config file to edit.
| * | | Quick Installer should specify which config file to edit.jkaurredhat2017-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bugzilla : https://bugzilla.redhat.com/show_bug.cgi?id=1460353 Signed-off-by: jkaurredhat <jkaur@redhat.com>
* | | | Merge pull request #4992 from ilackarms/cfme-take2Scott Dodson2017-08-043-41/+50
|\ \ \ \ | | | | | | | | | | only provision nfs PVs if cloud_provider not defined
| * | | | nfs only run if cloud_provider not definedScott Weiss2017-08-033-41/+50
| |/ / /
* | | | Merge pull request #5003 from sosiouxme/20170804-oc-clientScott Dodson2017-08-043-3/+33
|\ \ \ \ | | | | | | | | | | Origin image build: add oc client
| * | | | Origin image build: add oc clientLuke Meyer2017-08-043-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oc client was left out with the move away from playbook2image. However it is needed in the image for the `oc cluster up` use case for installing logging or metrics. This change adds oc via the latest signed and released client RPM, which requires adding the centos-openshift-origin repo to the image.
* | | | | Merge pull request #4925 from ↵OpenShift Bot2017-08-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/set-openshift_version-to-openshift_common_version_if_empty Merged by openshift-bot
| * | | | | Set the openshift_version from the openshift.common.version in case it is emptyJan Chaloupka2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen the openshift_version is set to an empty string. Which results in openshift_pkg_version set to "-". Thus, failing installation of base and excluder packages. For more info see https://bugzilla.redhat.com/show_bug.cgi?id=1474871
* | | | | | Merge pull request #4999 from jarrpa/null-file-fixScott Dodson2017-08-043-4/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | GlusterFS: Don't use /dev/null for empty file.
| * | | | | GlusterFS: Don't use /dev/null for empty file.Jose A. Rivera2017-08-043-4/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1478198 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | Merge pull request #5002 from sdodson/v37Scott Dodson2017-08-042-0/+248
|\ \ \ \ \ | | | | | | | | | | | | Add v3.7 hosted templates
| * | | | | Add v3.7 hosted templatesScott Dodson2017-08-042-0/+248
|/ / / / /
* | | | | Merge pull request #4789 from ↵Jan Chaloupka2017-08-043-8/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | ingvagabund/allow-to-specify-docker-registry-for-system-containers Allow to specify docker registry for system containers
| * | | | allow to specify docker registry for system containersJan Chaloupka2017-07-193-8/+8
| | | | |
* | | | | Merge pull request #4988 from stevekuznetsov/skuznets/tolerate-3.7Scott Dodson2017-08-03177-11/+96054
|\ \ \ \ \ | | | | | | | | | | | | Update version checks to tolerate 3.7
| * | | | | Default gte_3_7 to falseScott Dodson2017-08-031-1/+1
| | | | | |
| * | | | | Add v3.7 contentScott Dodson2017-08-03173-2/+96035
| | | | | |
| * | | | | Update version checks to tolerate 3.7Steve Kuznetsov2017-08-034-9/+19
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
* | | | | Merge pull request #3043 from jkhelil/scaleup_etcdScott Dodson2017-08-0211-15/+84
|\ \ \ \ \ | | | | | | | | | | | | Add etcd scaleup playbook
| * | | | | add etcd scaleup playbookjawed2017-06-1511-15/+84
| | | | | |
* | | | | | Merge pull request #4981 from jarrpa/heketi-key-fixScott Dodson2017-08-021-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | GlusterFS: Copy SSH private key to master node.
| * | | | | | GlusterFS: Copy SSH private key to master node.Jose A. Rivera2017-08-021-1/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1477718 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #4969 from sosiouxme/20170801-tolerate-ovs-beyond-36OpenShift Bot2017-08-022-90/+80
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merged by openshift-bot
| * | | | | package_version check: tolerate release version 3.7Luke Meyer2017-08-022-90/+80
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses issue https://github.com/openshift/openshift-ansible/issues/4967 For now, any version >= 3.6 is handled as if it were 3.6. We may want to keep that or fine-tune it later. Also, the ovs_version check is not updated. This is a post-install health check (does not block install/upgrade) with an update already in progress so will be addressed there.
* | | | | Merge pull request #4968 from sdodson/cfme-imagesOpenShift Bot2017-08-022-1/+13
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Use enterprise images for CFME enterprise deploymentsScott Dodson2017-08-012-1/+13
| | | | | |
* | | | | | Merge pull request #4976 from kprabhak/kp-calico-updatesScott Dodson2017-08-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Missing space
| * | | | | | Missing spaceKarthik Prabhakar2017-08-021-1/+1
| | | | | | |
* | | | | | | Merge pull request #4850 from kwoodson/normalize_logging_entryScott Dodson2017-08-023-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Normalize logging entry point to include std_include.
| * | | | | | Normalize logging entry.Kenny Woodson2017-07-243-5/+5
| | | | | | |
* | | | | | | Merge pull request #4958 from sdodson/logging-metrics-imagetagScott Dodson2017-08-022-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Switch logging and metrics OCP image tag from 3.6.0 to v3.6
| * | | | | | | Switch logging and metrics OCP image tag from 3.6.0 to v3.6Scott Dodson2017-08-012-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4592 from juanvallejo/jvallejo/verify-fluentd-logging-configOpenShift Bot2017-08-0211-109/+563
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | add fluentd logging driver config checkjuanvallejo2017-08-0111-109/+563
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4916 from richm/mux-client-modeOpenShift Bot2017-08-028-13/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | use mux_client_mode instead of use_mux_clientRich Megginson2017-08-018-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of the `openshift_logging_use_mux_client` boolean parameter, use `openshift_logging_mux_client_mode` which will allow us to support different mux client use cases: The value `maximal` will cause Fluentd to perform as much of the processing as possible at the local node. This currently means all of the processing *except* for the Kubernetes metadata processing, which will be done by mux. This is the currently recommended mode to use due to current scaling issues. The value `minimal` means that Fluentd will do *no* processing at all, and send the raw logs to mux for processing. This is currently not recommended to use due to current scaling issues. Ansible will warn you if you try to use this mode. `MUX_ALLOW_EXTERNAL` is no longer needed in the mux dc. mux now always operates to process external logs. The ansible setting `openshift_logging_mux_allow_external` is still required in order to set up the mux service to accept connections from outside of the cluster.
* | | | | | | | Merge pull request #4949 from carlpett/patch-1OpenShift Bot2017-08-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Fix aws_secret_key checkCalle Pettersson2017-07-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #4961 from jarrpa/minor-namespace-fixScott Dodson2017-08-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | GlusterFS: Check for namespace if deploying a StorageClass
| * | | | | | | | | GlusterFS: Check for namespace if deploying a StorageClassJose A. Rivera2017-08-011-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1476197 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | Merge pull request #4894 from tbielawa/reg-dns-scaleup-bz1469336OpenShift Bot2017-08-016-7/+70
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Use existing OPENSHIFT_DEFAULT_REGISTRY setting during masters scaleupTim Bielawa2017-07-286-7/+70
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug which reported that AFTER a cluster upgrade from OCP 3.5 to 3.6, any masters which are later added via the scaleup playbooks are setting a value for OPENSHIFT_DEFAULT_REGISTRY which is inconsistent with the already configured masters. * OPENSHIFT_DEFAULT_REGISTRY value is saved from oo_first_master * The new scaleup master has a fact set noting it is a scaleup host * The saved OPENSHIFT_DEFAULT_REGISTRY value is used instead of the default for 3.6, which is to use a hard-coded registry value of 'docker-registry.default.svc:5000' Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1469336
* | | | | | | | Merge pull request #4700 from sdodson/rate-limitOpenShift Bot2017-08-013-4/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Merged by openshift-bot
| * | | | | | | Add rate limit configurabilityScott Dodson2017-07-063-4/+18
| | | | | | | |
* | | | | | | | Merge pull request #4912 from abutcher/openshift-node-factsOpenShift Bot2017-08-015-50/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot