Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | 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 |
| | | | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.6.135-1]. | Jenkins CD Merge Bot | 2017-07-05 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.135 | ||||
* | | | 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 | ||||
* | | | Merge pull request #4679 from sdodson/svc-catalog-tag | Scott Dodson | 2017-07-05 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Update the tag for enterprise service catalog | ||||
| * | | 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 |
| | | | |||||
* | | | Merge pull request #4674 from ↵ | Jan Chaloupka | 2017-07-05 | 2 | -7/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | ingvagabund/drop-etcdctl-before-etcd_container-service drop etcdctl before the etcd_container service | ||||
| * | | | 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. | ||||
* / | | Automatic commit of package [openshift-ansible] release [3.6.134-1]. | Jenkins CD Merge Bot | 2017-07-05 | 2 | -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 Bot | 2017-07-04 | 2 | -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-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 #4533 from sdodson/storage-migration-fixes | OpenShift Bot | 2017-07-03 | 1 | -6/+12 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Fixes to storage migration | Scott Dodson | 2017-06-22 | 1 | -6/+12 |
| | | | | | |||||
* | | | | | 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 | ||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.132-1]. | Jenkins CD Merge Bot | 2017-07-03 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.132 | ||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.131-1]. | Jenkins CD Merge Bot | 2017-07-02 | 2 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.131 | ||||
* | | | | | Merge pull request #4530 from sdodson/node-dns | Scott Dodson | 2017-07-01 | 26 | -64/+163 |
|\ \ \ \ \ | | | | | | | | | | | | | Utilize node dns services | ||||
| * | | | | | Fix upgrade | Scott Dodson | 2017-06-30 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Prevent the script to use default route ip as upstream nameserver. | Steve Teuber | 2017-06-30 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Use default ports for dnsmasq and node dns | Scott Dodson | 2017-06-30 | 11 | -11/+9 |
| | | | | | | |||||
| * | | | | | Run dns on the node and use that for dnsmasq | Scott Dodson | 2017-06-30 | 27 | -63/+152 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #4658 from abutcher/openshift-default-registry | OpenShift Bot | 2017-07-01 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Set OPENSHIFT_DEFAULT_REGISTRY in registry dc. | Andrew Butcher | 2017-06-30 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #4655 from sosiouxme/20170630-atomic-etcd-bz1466622 | OpenShift Bot | 2017-06-30 | 2 | -1/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot |