summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4863 from ↵Scott Dodson2017-07-252-2/+0
|\ | | | | | | | | openshift/revert-4755-set-killmode-to-process-in-node-service-file Revert "set KillMode to process in node service file"
| * Revert "set KillMode to process in node service file"Scott Dodson2017-07-252-2/+0
|/
* Merge pull request #4854 from ewolinetz/metrics_remove_no_logScott Dodson2017-07-251-1/+0
|\ | | | | Removing no_log from htpasswd invocation so not to supress errors
| * Removing nolog from htpasswd invocation so not to supress errorsewolinetz2017-07-241-1/+0
| |
* | Merge pull request #4858 from jarrpa/unsupported-paramsScott Dodson2017-07-255-28/+28
|\ \ | | | | | | Remove unsupported parameters from example inventory files.
| * | Remove unsupported parameters from example inventory files.Jose A. Rivera2017-07-255-28/+28
|/ / | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | Merge pull request #4839 from tripledes/unexclude_use_abs_pathScott Dodson2017-07-251-2/+2
|\ \ | | | | | | Use absolute path when un-excluding
| * | Use absolute path when unexcludingSergi Jimenez2017-07-241-2/+2
| | | | | | | | | | | | * As follow-up on #4835, use absolute path also when unexcluding
* | | Merge pull request #4856 from sdodson/fix-lintScott Dodson2017-07-241-3/+3
|\ \ \ | | | | | | | | Fix lint errors
| * | | Fix lint errorsScott Dodson2017-07-241-3/+3
|/ / /
* | | Merge pull request #4846 from dcbw/libvirt-fixupsScott Dodson2017-07-242-2/+12
|\ \ \ | | | | | | | | libvirt fixups
| * | | libvirt: fall back to mkisofs if genisoimage isn't availableDan Williams2017-07-242-2/+6
| | | |
| * | | libvirt: add documentation about SSH keypair requirementsDan Williams2017-07-241-0/+6
| | | |
* | | | Merge pull request #4806 from tbielawa/bz1466783_etcd_ips_in_masters_no_proxyScott Dodson2017-07-244-4/+20
|\ \ \ \ | | | | | | | | | | Bz1466783 etcd ips in masters no proxy
| * | | | Default an empty list for etcd_to_config if not thereTim Bielawa2017-07-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add filter names of filters that failed me for to their error messages so you can figure out which filter threw an exception when you're debugging log files.
| * | | | If proxy in effect, add etcd host IP addresses to NO_PROXY list on mastersTim Bielawa2017-07-213-0/+16
| | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1466783
* | | | | Merge pull request #4849 from kwoodson/sc_prov_fix_2Kenny Woodson2017-07-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix for storageclass provision defaults.
| * | | | | Removed kubernetes.io string from default.Kenny Woodson2017-07-241-2/+2
|/ / / / /
* | | | | Merge pull request #4847 from sdodson/optional-migrationsScott Dodson2017-07-243-8/+41
|\ \ \ \ \ | | | | | | | | | | | | Allow storage migrations to be optional and/or non fatal
| * | | | | Allow storage migrations to be optional and/or non fatalScott Dodson2017-07-243-8/+41
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow configuration of these options, these are their defaults openshift_upgrade_pre_storage_migration_enabled=true openshift_upgrade_post_storage_migration_enabled=true openshift_upgrade_pre_storage_migration_fatal=true openshift_upgrade_post_storage_migration_fatal=false
* | | | | Merge pull request #4830 from fabianvf/asb-image-renameScott Dodson2017-07-241-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add ose- prefix to ansible service broker name
| * | | | 1472467- add ose- prefix to ansible service broker nameFabian von Feilitzsch2017-07-211-1/+1
| | | | |
* | | | | Merge pull request #4841 from kwoodson/masterScott Dodson2017-07-241-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix for gce storageclass provisioner default.
| * | | | Pass the provisioner to the module.Kenny Woodson2017-07-241-0/+1
| | | | |
* | | | | Merge pull request #4682 from juanvallejo/jvallejo/verify-logging-index-timeRodolfo Carvalho2017-07-244-6/+321
|\ \ \ \ \ | | | | | | | | | | | | verify sane log times in logging stack
| * | | | | verify sane log times in logging stackjuanvallejo2017-07-204-6/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch verifies that logs sent from logging pods can be queried on the Elasticsearch pod within a reasonable amount of time.
* | | | | | Merge pull request #4307 from dmsimard/openshift-testingScott Dodson2017-07-244-3/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Support enabling the centos-openshift-origin-testing repository
| * | | | | Support enabling the centos-openshift-origin-testing repositoryDavid Moreau-Simard2017-07-234-3/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New versions of Origin land in the -testing repository before they are tagged for release. This effectively adds the ability to easily test a new unreleased version (currently in this case 1.5.1) by enabling the correct repository if 'openshift_repos_enable_testing' is true.
* | | | | Merge pull request #4835 from tripledes/excluder_absolute_pathScott Dodson2017-07-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use absolute path for excluders
| * | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1474246Sergi Jimenez2017-07-241-2/+2
| |/ / / / | | | | | | | | | | | | | | | Use absolute path when executing excluder as it's used when checking for excluder.
* | | | | Merge pull request #4826 from jarrpa/glusterfs-fixes-sixScott Dodson2017-07-243-21/+38
|\ \ \ \ \ | |/ / / / |/| | | | GlusterFS fixes 6
| * | | | GlusterFS: Create registry storage svc and ep in registry namespaceJose A. Rivera2017-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | GlusterFS: Pass all booleans through bool filter.Jose A. Rivera2017-07-212-16/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | GlusterFS: Fix bug in detecting whether to open firewall ports.Jose A. Rivera2017-07-211-3/+20
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | Merge pull request #4828 from ewolinetz/bz1472222Scott Dodson2017-07-211-1/+1
|\ \ \ \ | |/ / / |/| | | Updating openshift_logging_kibana default for kibana hostname
| * | | Updating openshift_logging_kibana default for kibana hostnameewolinetz2017-07-211-1/+1
| | | |
* | | | Merge pull request #4805 from kwoodson/sc_gce_fixScott Dodson2017-07-202-5/+3
|\ \ \ \ | |_|_|/ |/| | | [bz 1473154] Fix gce storageclass provider.
| * | | Added parameters inside of gce defaults. Pass all params to the module.Kenny Woodson2017-07-202-5/+3
| | | |
* | | | Merge pull request #4798 from abutcher/hosted-etcd-pvScott Dodson2017-07-202-1/+2
|\ \ \ \ | | | | | | | | | | Add etcd exports to openshift_storage_nfs
| * | | | Add etcd exports to openshift_storage_nfsAndrew Butcher2017-07-192-1/+2
| | | | |
* | | | | Merge pull request #4794 from tbielawa/please_fix_the_proxiesScott Dodson2017-07-201-69/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix proxy settings. For real. For actual this time.
| * | | | | Hopefully finally fix the no_proxy settingsTim Bielawa2017-07-191-69/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1467776 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1466783 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1472244 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1468424 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1470165 Some of there were 'fixed' before but that commit was merged too soon. This actually fixes the needful.
* | | | | | Merge pull request #4810 from ewolinetz/bz1470624Scott Dodson2017-07-201-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updating verbs for serviceclasses objects
| * | | | | | Updating verbs for serviceclasses objectsewolinetz2017-07-201-0/+6
| | | | | | |
* | | | | | | Merge pull request #4807 from openshift/fix-broken-linkScott Dodson2017-07-201-5/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix broken link to Docker image instructions
| * | | | | | Fix broken link to Docker image instructionsRodolfo Carvalho2017-07-201-5/+6
|/ / / / / / | | | | | | | | | | | | And document that one needs to install dependencies before running playbooks.
* | | | | | Merge pull request #4742 from juanvallejo/jvallejo/remove-dependency-on-p2iRodolfo Carvalho2017-07-2016-112/+229
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Remove dependency on playbook2image, rebase directly on OS.
| * | | | | image builds: remove dependency on playbook2imagejuanvallejo2017-07-1816-112/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need the builder functionality from playbook2image and the resulting image was overly complicated, so this simply builds on Centos/RHEL.
* | | | | | Merge pull request #4316 from ↵Rodolfo Carvalho2017-07-204-0/+434
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | juanvallejo/jvallejo/add-increased-etcd-traffic-check add check to detect increased etcd traffic
| * | | | | | add etcd increased-traffic checkjuanvallejo2017-07-194-0/+434
| | | | | | |