Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4714 from sdodson/image-stream-sync | OpenShift Bot | 2017-07-08 | 100 | -1/+63835 |
|\ | | | | | Merged by openshift-bot | ||||
| * | xPaas v1.4.1 for 3.4 | Scott Dodson | 2017-07-07 | 33 | -0/+21278 |
| | | |||||
| * | xPaas v1.4.1 for 3.5 | Scott Dodson | 2017-07-07 | 33 | -0/+21278 |
| | | |||||
| * | xPaaS 1.4.1 for 3.6 | Scott Dodson | 2017-07-07 | 34 | -1/+21279 |
| | | |||||
* | | Merge pull request #4719 from abutcher/glusterfs-nodename | OpenShift Bot | 2017-07-07 | 3 | -4/+4 |
|\ \ | | | | | | | Merged by openshift-bot | ||||
| * | | Use openshift.node.nodename as glusterfs_hostname. | Andrew Butcher | 2017-07-07 | 3 | -4/+4 |
| | | | |||||
* | | | Merge pull request #4703 from tbielawa/bz1468187 | Scott Dodson | 2017-07-07 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Run some basic etcd checks after migration to ensure leases are good | ||||
| * | | | Wait for etcd to become healthy before migrating TTL | Tim Bielawa | 2017-07-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468187 | ||||
* | | | | Merge pull request #4711 from tbielawa/bz1468424 | OpenShift Bot | 2017-07-07 | 1 | -8/+9 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | Only add entries to NO_PROXY settings if a NO_PROXY value is set | Tim Bielawa | 2017-07-07 | 1 | -8/+9 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468424 Incorrect indentation caused base svc/cluster.local/hostname entries to be added to the NO_PROXY settings regardless of if the user was configuring NO_PROXY or not. | ||||
* | | | Merge pull request #4716 from ewolinetz/fix_broker_configmap | Scott Dodson | 2017-07-07 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | updating configmap map definition to fix asb not starting up correctly | ||||
| * | | | updating configmap map definition to fix asb not starting up correctly | ewolinetz | 2017-07-07 | 1 | -4/+4 |
| |/ / | |||||
* / / | container-engine: Update Fedora registry url | Steve Milner | 2017-07-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4692 from shawn-hurley/bugzilla-1467948 | Scott Dodson | 2017-07-07 | 2 | -2/+7 |
|\ \ | | | | | | | 1467948 - Ansible Service Broker configuration values | ||||
| * | | fixing configuation values. | Shawn Hurley | 2017-07-05 | 2 | -2/+7 |
| | | | |||||
* | | | Install container-selinux with container-engine | Steve Milner | 2017-07-06 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #4696 from richm/bug-1466152 | Scott Dodson | 2017-07-06 | 11 | -24/+10 |
|\ \ \ | | | | | | | | | Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries | ||||
| * | | | Bug 1466152 - Json-file log driver: Neither ↵ | Rich Megginson | 2017-07-06 | 11 | -24/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries https://bugzilla.redhat.com/show_bug.cgi?id=1466152 Do not set openshift_logging_fluentd_use_journal or USE_JOURNAL at all unless it is explicitly set as an ansible param. It is almost always better to let fluentd figure out which log driver docker is using. | ||||
* | | | | Merge pull request #4531 from abutcher/f26-ah-setsebool | OpenShift Bot | 2017-07-06 | 2 | -26/+76 |
|\ \ \ \ | |/ / / |/| | | | Merged by openshift-bot | ||||
| * | | | Workaround seboolean module with setsebool command. | Andrew Butcher | 2017-07-05 | 2 | -26/+76 |
| | | | | |||||
* | | | | Fix yamllint | Scott Dodson | 2017-07-06 | 1 | -10/+10 |
| | | | | |||||
* | | | | Merge pull request #4681 from kwoodson/default_registry_env_fix | Scott Dodson | 2017-07-06 | 1 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting in env file. | ||||
| * | | | | Removed quotes and added env variable to be specific. | Kenny Woodson | 2017-07-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting. | Kenny Woodson | 2017-07-05 | 1 | -2/+11 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4680 from ingvagabund/set-label-of-var-lib-etcd | Jan Chaloupka | 2017-07-06 | 1 | -0/+15 |
|\ \ \ \ | | | | | | | | | | | set the proper label of /var/lib/etcd directory | ||||
| * | | | | set the proper label of /var/lib/etcd directory | Jan Chaloupka | 2017-07-05 | 1 | -0/+15 |
| |/ / / | |||||
* | | | | Merge pull request #4684 from ewolinetz/service_catalog_multimaster | Scott Dodson | 2017-07-05 | 5 | -10/+129 |
|\ \ \ \ | | | | | | | | | | | Addressing servicecatalog doesnt have enough permissions and multimas… | ||||
| * | | | | Synching certs and aggregator configs from first master to all other masters | ewolinetz | 2017-07-05 | 2 | -3/+105 |
| | | | | | |||||
| * | | | | Addressing servicecatalog doesnt have enough permissions and multimaster ↵ | ewolinetz | 2017-07-05 | 3 | -7/+24 |
| |/ / / | | | | | | | | | | | | | config for service-catalog | ||||
* | | | | Merge pull request #4554 from richm/add-back-mux-client-config | Scott Dodson | 2017-07-05 | 2 | -0/+13 |
|\ \ \ \ | | | | | | | | | | | add back mux_client config that was removed | ||||
| * | | | | add back mux_client config that was removed | Rich Megginson | 2017-07-05 | 2 | -0/+13 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | not sure how this got removed, during the rebase of the logging roles perhaps? Also ensure that the value used in the fluentd daemonset env var is lower cased to work with the fluentd/run.sh script. | ||||
* | | | | Merge pull request #4671 from ↵ | OpenShift Bot | 2017-07-05 | 2 | -3/+7 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | ingvagabund/use-master-certificates-for-oadm-migrate-etcd-ttl Merged by openshift-bot | ||||
| * | | | use master etcd certificates when delegating oadm migrate etcd-ttl | Jan Chaloupka | 2017-07-04 | 2 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #4678 from tbielawa/bz1467776 | OpenShift Bot | 2017-07-05 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Fix missing service domain .svc in NO_PROXY settings | Tim Bielawa | 2017-07-05 | 1 | -1/+3 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1467776 Adds the tld '.svc' to the docker NO_PROXY list | ||||
* / | | | Update the tag for enterprise service catalog | Scott Dodson | 2017-07-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #4664 from sdodson/service-catalog-images | Scott Dodson | 2017-07-05 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix service catalog image prefixes | ||||
| * | | | Fix prefix for OCP service-catalog prefix | Scott Dodson | 2017-07-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fully qualify ocp ansible_service_broker_image_prefix | Scott Dodson | 2017-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | drop etcdctl before the etcd_container service | Jan Chaloupka | 2017-07-04 | 2 | -7/+7 |
| |/ / |/| | | | | | | | | | | | If the etcdctl is dropped after the etcd_container is enabled, label of /var/lib/etcd directory is set to var_lib_t instead of virt_sandbox_file_t. | ||||
* | | | Merge pull request #4668 from giuseppe/etcd-system-container-fix-migration | OpenShift Bot | 2017-07-03 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | etcd, syscontainer: fix copy of existing datastore | Giuseppe Scrivano | 2017-07-03 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1466638 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | Merge pull request #4666 from ↵ | OpenShift Bot | 2017-07-03 | 2 | -15/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ingvagabund/pre-pull-docker-images-before-stopping-docker Merged by openshift-bot | ||||
| * | | | | pre-pull images before stopping docker | Jan Chaloupka | 2017-07-03 | 2 | -15/+14 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3131 from sdodson/no_proxy_bz1414749_bz1414748 | OpenShift Bot | 2017-07-03 | 1 | -18/+27 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Always convert no_proxy from string into a list | Scott Dodson | 2017-07-03 | 1 | -18/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add dns_domain, hostname to no_proxy list Fixes BZ1414748 Fixes BZ1414749 | ||||
* | | | | | Merge pull request #4656 from jcantrill/bz1466680_fix_alt_log_namespace | OpenShift Bot | 2017-07-03 | 1 | -0/+4 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| * | | | | fix 1466680. Fix logging deploying to the specified namespace | Jeff Cantrill | 2017-06-30 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #4641 from wozniakjan/logging_es_probe | OpenShift Bot | 2017-07-03 | 1 | -10/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Merged by openshift-bot | ||||
| * | | | | logging_es: temporarily disable readiness probe | Jan Wozniak | 2017-06-29 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The readiness probe, as currently implemented, together with the ES master discovery using the logging-es service, causes a deadlock on clusters with more than one node. Readiness probe will be reintroduced in later release. More information in: https://bugzilla.redhat.com/show_bug.cgi?id=1459430 |