summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4624 from ↵Jan Chaloupka2017-07-085-0/+5
|\ | | | | | | | | ingvagabund/increase-timeout-when-waiting-for-master-and-nodes increase implicit 300s default timeout to explicit 600s
| * increase implicit 300s default timeout to explicit 600sJan Chaloupka2017-06-285-0/+5
| |
* | Automatic commit of package [openshift-ansible] release [3.6.138-1].Jenkins CD Merge Bot2017-07-082-2/+15
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.138
* | Merge pull request #4714 from sdodson/image-stream-syncOpenShift Bot2017-07-08100-1/+63835
|\ \ | | | | | | Merged by openshift-bot
| * | xPaas v1.4.1 for 3.4Scott Dodson2017-07-0733-0/+21278
| | |
| * | xPaas v1.4.1 for 3.5Scott Dodson2017-07-0733-0/+21278
| | |
| * | xPaaS 1.4.1 for 3.6Scott Dodson2017-07-0734-1/+21279
| | |
* | | Merge pull request #4719 from abutcher/glusterfs-nodenameOpenShift Bot2017-07-073-4/+4
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Use openshift.node.nodename as glusterfs_hostname.Andrew Butcher2017-07-073-4/+4
| | | |
* | | | Merge pull request #4703 from tbielawa/bz1468187Scott Dodson2017-07-071-0/+9
|\ \ \ \ | | | | | | | | | | Run some basic etcd checks after migration to ensure leases are good
| * | | | Wait for etcd to become healthy before migrating TTLTim Bielawa2017-07-071-0/+9
| | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468187
* | | | | Merge pull request #4711 from tbielawa/bz1468424OpenShift Bot2017-07-071-8/+9
|\ \ \ \ \ | |/ / / / |/| | | | Merged by openshift-bot
| * | | | Only add entries to NO_PROXY settings if a NO_PROXY value is setTim Bielawa2017-07-071-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_configmapScott Dodson2017-07-071-4/+4
|\ \ \ \ | | | | | | | | | | updating configmap map definition to fix asb not starting up correctly
| * | | | updating configmap map definition to fix asb not starting up correctlyewolinetz2017-07-071-4/+4
| |/ / /
* | | | Merge pull request #4717 from ashcrow/fedora-container-moveScott Dodson2017-07-071-1/+1
|\ \ \ \ | |/ / / |/| | | container-engine: Update Fedora registry url
| * | | container-engine: Update Fedora registry urlSteve Milner2017-07-071-1/+1
|/ / /
* | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:32:32 +0000