summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4692 from shawn-hurley/bugzilla-1467948Scott Dodson2017-07-072-2/+7
|\ | | | | 1467948 - Ansible Service Broker configuration values
| * fixing configuation values.Shawn Hurley2017-07-052-2/+7
| |
* | Automatic commit of package [openshift-ansible] release [3.6.137-1].Jenkins CD Merge Bot2017-07-072-2/+15
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.137
* | Merge pull request #4702 from ashcrow/atomic-command-workaroundsScott Dodson2017-07-061-0/+6
|\ \ | | | | | | Atomic command workarounds
| * | Install container-selinux with container-engineSteve Milner2017-07-061-0/+6
|/ /
* | Merge pull request #4696 from richm/bug-1466152Scott Dodson2017-07-0611-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 Megginson2017-07-0611-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-setseboolOpenShift Bot2017-07-062-26/+76
|\ \ \ | |/ / |/| | Merged by openshift-bot
| * | Workaround seboolean module with setsebool command.Andrew Butcher2017-07-052-26/+76
| | |
* | | Merge pull request #4694 from ewolinetz/service_catalog_serialScott Dodson2017-07-061-0/+1
|\ \ \ | | | | | | | | Adding serial: 1 to play to ensure we run one at a time
| * | | Adding serial: 1 to play to ensure we run one at a timeewolinetz2017-07-061-0/+1
|/ / /
* | | Merge pull request #4691 from sdodson/fix-travisScott Dodson2017-07-061-10/+10
|\ \ \ | | | | | | | | Fix yamllint
| * | | Fix yamllintScott Dodson2017-07-061-10/+10
|/ / /
* | | Merge pull request #4681 from kwoodson/default_registry_env_fixScott Dodson2017-07-061-2/+11
|\ \ \ | | | | | | | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting in env file.
| * | | Removed quotes and added env variable to be specific.Kenny Woodson2017-07-051-2/+2
| | | |
| * | | [BZ 1467786] Fix for OPENSHIFT_DEFAULT_REGISTRY setting.Kenny Woodson2017-07-051-2/+11
| | |/ | |/|
* | | Merge pull request #4680 from ingvagabund/set-label-of-var-lib-etcdJan Chaloupka2017-07-061-0/+15
|\ \ \ | | | | | | | | set the proper label of /var/lib/etcd directory
| * | | set the proper label of /var/lib/etcd directoryJan Chaloupka2017-07-051-0/+15
| |/ /
* | | Automatic commit of package [openshift-ansible] release [3.6.136-1].Jenkins CD Merge Bot2017-07-062-2/+11
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.136
* | | Merge pull request #4684 from ewolinetz/service_catalog_multimasterScott Dodson2017-07-056-10/+141
|\ \ \ | | | | | | | | Addressing servicecatalog doesnt have enough permissions and multimas…
| * | | Synching certs and aggregator configs from first master to all other mastersewolinetz2017-07-053-10/+116
| | | |
| * | | Addressing servicecatalog doesnt have enough permissions and multimaster ↵ewolinetz2017-07-054-7/+32
| |/ / | | | | | | | | | config for service-catalog
* | | Merge pull request #4554 from richm/add-back-mux-client-configScott Dodson2017-07-052-0/+13
|\ \ \ | | | | | | | | add back mux_client config that was removed
| * | | add back mux_client config that was removedRich Megginson2017-07-052-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 Bot2017-07-052-3/+7
|\ \ \ | | | | | | | | | | | | | | | | ingvagabund/use-master-certificates-for-oadm-migrate-etcd-ttl Merged by openshift-bot
| * | | use master etcd certificates when delegating oadm migrate etcd-ttlJan Chaloupka2017-07-042-3/+7
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.6.135-1].Jenkins CD Merge Bot2017-07-052-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.135
* | | | Merge pull request #4678 from tbielawa/bz1467776OpenShift Bot2017-07-051-1/+3
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix missing service domain .svc in NO_PROXY settingsTim Bielawa2017-07-051-1/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1467776 Adds the tld '.svc' to the docker NO_PROXY list
* | | | Merge pull request #4679 from sdodson/svc-catalog-tagScott Dodson2017-07-051-1/+1
|\ \ \ \ | |/ / / |/| | | Update the tag for enterprise service catalog
| * | | Update the tag for enterprise service catalogScott Dodson2017-07-051-1/+1
|/ / /
* | | Merge pull request #4664 from sdodson/service-catalog-imagesScott Dodson2017-07-052-2/+2
|\ \ \ | | | | | | | | Fix service catalog image prefixes
| * | | Fix prefix for OCP service-catalog prefixScott Dodson2017-07-031-1/+1
| | | |
| * | | Fully qualify ocp ansible_service_broker_image_prefixScott Dodson2017-07-031-1/+1
| | | |
* | | | Merge pull request #4674 from ↵Jan Chaloupka2017-07-052-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ingvagabund/drop-etcdctl-before-etcd_container-service drop etcdctl before the etcd_container service
| * | | | drop etcdctl before the etcd_container serviceJan Chaloupka2017-07-042-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.
* / | | Automatic commit of package [openshift-ansible] release [3.6.134-1].Jenkins CD Merge Bot2017-07-052-2/+5
|/ / / | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.134
* | | Automatic commit of package [openshift-ansible] release [3.6.133-1].Jenkins CD Merge Bot2017-07-042-2/+11
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.133
* | | Merge pull request #4668 from giuseppe/etcd-system-container-fix-migrationOpenShift Bot2017-07-031-2/+5
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | etcd, syscontainer: fix copy of existing datastoreGiuseppe Scrivano2017-07-031-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 Bot2017-07-032-15/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ingvagabund/pre-pull-docker-images-before-stopping-docker Merged by openshift-bot
| * | | | pre-pull images before stopping dockerJan Chaloupka2017-07-032-15/+14
| | |/ / | |/| |
* | | | Merge pull request #3131 from sdodson/no_proxy_bz1414749_bz1414748OpenShift Bot2017-07-031-18/+27
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Always convert no_proxy from string into a listScott Dodson2017-07-031-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_namespaceOpenShift Bot2017-07-031-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Merged by openshift-bot
| * | | | fix 1466680. Fix logging deploying to the specified namespaceJeff Cantrill2017-06-301-0/+4
| | | | |
* | | | | Merge pull request #4533 from sdodson/storage-migration-fixesOpenShift Bot2017-07-031-6/+12
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Fixes to storage migrationScott Dodson2017-06-221-6/+12
| | | | | |
* | | | | | Merge pull request #4641 from wozniakjan/logging_es_probeOpenShift Bot2017-07-031-10/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merged by openshift-bot
| * | | | | logging_es: temporarily disable readiness probeJan Wozniak2017-06-291-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 09:02:25 +0000