Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4730 from ozdanborne/patch-gencerts | Scott Dodson | 2017-07-11 | 2 | -26/+18 |
|\ | | | | | Fix calico when certs are auto-generated | ||||
| * | Fix calico when certs are auto-generated | Dan Osborne | 2017-07-10 | 2 | -26/+18 |
| | | |||||
* | | Automatic commit of package [openshift-ansible] release [3.6.141-1]. | Jenkins CD Merge Bot | 2017-07-11 | 2 | -2/+6 |
| | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.141 | ||||
* | | Merge pull request #4723 from ewolinetz/fix_service_catalog_fetch | Scott Dodson | 2017-07-10 | 1 | -0/+2 |
|\ \ | | | | | | | updating fetch tasks to be flat paths | ||||
| * | | updating fetch tasks to be flat paths | ewolinetz | 2017-07-10 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #4725 from mtnbikenc/fix-network-manager | Scott Dodson | 2017-07-10 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Add evaluate_groups.yml to network_manager playbook | ||||
| * | | Add evaluate_groups.yml to network_manager playbook | Russell Teague | 2017-07-10 | 1 | -0/+2 |
|/ / | | | | | | | | | The network_manager.yml playbook uses oo_* groups names which are defined in the evaluate_groups.yml playbook. | ||||
* | | Automatic commit of package [openshift-ansible] release [3.6.140-1]. | Jenkins CD Merge Bot | 2017-07-10 | 2 | -2/+5 |
| | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.140 | ||||
* | | Automatic commit of package [openshift-ansible] release [3.6.139-1]. | Jenkins CD Merge Bot | 2017-07-08 | 2 | -2/+5 |
| | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.139 | ||||
* | | Merge pull request #4624 from ↵ | Jan Chaloupka | 2017-07-08 | 5 | -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 600s | Jan Chaloupka | 2017-06-28 | 5 | -0/+5 |
| | | | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.138-1]. | Jenkins CD Merge Bot | 2017-07-08 | 2 | -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-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 |
| |/ / / / | |||||
* | | | | | Merge pull request #4717 from ashcrow/fedora-container-move | Scott Dodson | 2017-07-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | container-engine: Update Fedora registry url | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.137-1]. | Jenkins CD Merge Bot | 2017-07-07 | 2 | -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-workarounds | Scott Dodson | 2017-07-06 | 1 | -0/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Atomic command workarounds | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Merge pull request #4694 from ewolinetz/service_catalog_serial | Scott Dodson | 2017-07-06 | 1 | -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 time | ewolinetz | 2017-07-06 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4691 from sdodson/fix-travis | Scott Dodson | 2017-07-06 | 1 | -10/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix yamllint | ||||
| * | | | | | 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 |
| |/ / / / | |||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.136-1]. | Jenkins CD Merge Bot | 2017-07-06 | 2 | -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_multimaster | Scott Dodson | 2017-07-05 | 6 | -10/+141 |
|\ \ \ \ \ | | | | | | | | | | | | | Addressing servicecatalog doesnt have enough permissions and multimas… | ||||
| * | | | | | Synching certs and aggregator configs from first master to all other masters | ewolinetz | 2017-07-05 | 3 | -10/+116 |
| | | | | | | |||||
| * | | | | | Addressing servicecatalog doesnt have enough permissions and multimaster ↵ | ewolinetz | 2017-07-05 | 4 | -7/+32 |
| |/ / / / | | | | | | | | | | | | | | | | 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. |