summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename vars to avoid double negatives and ensuing confusionJohn Sanda2017-08-143-6/+6
* set prometheus endpoint properties to false by defaultJohn Sanda2017-08-091-2/+2
* add options to disable prometheus endpointsJohn Sanda2017-07-243-0/+7
* Enable JMX reporting of internal metricsJohn Sanda2017-07-071-0/+1
* Merge pull request #4696 from richm/bug-1466152Scott Dodson2017-07-0611-24/+10
|\
| * Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_jo...Rich Megginson2017-07-0611-24/+10
* | Merge pull request #4531 from abutcher/f26-ah-setseboolOpenShift Bot2017-07-062-26/+76
|\ \ | |/ |/|
| * 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 timeewolinetz2017-07-061-0/+1
|/ /
* | Merge pull request #4691 from sdodson/fix-travisScott Dodson2017-07-061-10/+10
|\ \
| * | Fix yamllintScott Dodson2017-07-061-10/+10
|/ /
* | Merge pull request #4681 from kwoodson/default_registry_env_fixScott Dodson2017-07-061-2/+11
|\ \
| * | 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 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
* | | Merge pull request #4684 from ewolinetz/service_catalog_multimasterScott Dodson2017-07-056-10/+141
|\ \ \
| * | | Synching certs and aggregator configs from first master to all other mastersewolinetz2017-07-053-10/+116
| * | | Addressing servicecatalog doesnt have enough permissions and multimaster conf...ewolinetz2017-07-054-7/+32
| |/ /
* | | Merge pull request #4554 from richm/add-back-mux-client-configScott Dodson2017-07-052-0/+13
|\ \ \
| * | | add back mux_client config that was removedRich Megginson2017-07-052-0/+13
| |/ /
* | | Merge pull request #4671 from ingvagabund/use-master-certificates-for-oadm-mi...OpenShift Bot2017-07-052-3/+7
|\ \ \
| * | | 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
* | | | Merge pull request #4678 from tbielawa/bz1467776OpenShift Bot2017-07-051-1/+3
|\ \ \ \
| * | | | Fix missing service domain .svc in NO_PROXY settingsTim Bielawa2017-07-051-1/+3
| | |/ / | |/| |
* | | | Merge pull request #4679 from sdodson/svc-catalog-tagScott Dodson2017-07-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 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 ingvagabund/drop-etcdctl-before-etcd_container-...Jan Chaloupka2017-07-052-7/+7
|\ \ \ \
| * | | | drop etcdctl before the etcd_container serviceJan Chaloupka2017-07-042-7/+7
| | |/ / | |/| |
* / | | Automatic commit of package [openshift-ansible] release [3.6.134-1].Jenkins CD Merge Bot2017-07-052-2/+5
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.6.133-1].Jenkins CD Merge Bot2017-07-042-2/+11
* | | Merge pull request #4668 from giuseppe/etcd-system-container-fix-migrationOpenShift Bot2017-07-031-2/+5
|\ \ \
| * | | etcd, syscontainer: fix copy of existing datastoreGiuseppe Scrivano2017-07-031-2/+5
* | | | Merge pull request #4666 from ingvagabund/pre-pull-docker-images-before-stopp...OpenShift Bot2017-07-032-15/+14
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | Always convert no_proxy from string into a listScott Dodson2017-07-031-18/+27
* | | | | Merge pull request #4656 from jcantrill/bz1466680_fix_alt_log_namespaceOpenShift Bot2017-07-031-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | Fixes to storage migrationScott Dodson2017-06-221-6/+12
* | | | | | Merge pull request #4641 from wozniakjan/logging_es_probeOpenShift Bot2017-07-031-10/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | logging_es: temporarily disable readiness probeJan Wozniak2017-06-291-10/+0
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.132-1].Jenkins CD Merge Bot2017-07-032-2/+5