summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3327 from ingvagabund/fix-ruamel-yamlScott Dodson2017-02-101-8/+1
|\ | | | | use the correct name for the ruamel-yaml python module
| * use the correct name for the ruamel-yaml python moduleJan Chaloupka2017-02-101-8/+1
| |
* | Merge pull request #3297 from jcantrill/bz_1419962_cassandra_pwd_failureScott Dodson2017-02-109-70/+53
|\ \ | | | | | | bug 1419962. fix openshift_metrics pwd issue after reinstall where ca…
| * | bug 1419962. fix openshift_metrics pwd issue after reinstall where cassandra ↵Jeff Cantrill2017-02-099-70/+53
| | | | | | | | | | | | has incorrect pwd exception
* | | Merge pull request #3320 from jcantrill/bz_1420538_metrics_supplemental_groupsScott Dodson2017-02-102-0/+4
|\ \ \ | | | | | | | | bug 1420538. Allow users to set supplementalGroup for Cassandra
| * | | bug 1420538. Allow users to set supplementalGroup for CassandraJeff Cantrill2017-02-092-0/+4
| | | |
* | | | Merge pull request #3281 from ewolinetz/revert_3257Scott Dodson2017-02-1010-42/+44
|\ \ \ \ | |_|_|/ |/| | | Reverting commit 3257 and renaming master_url to openshift_logging_ma…
| * | | Updating defaults to pull from previously defined variable names used in ↵ewolinetz2017-02-086-22/+24
| | | | | | | | | | | | | | | | playbooks
| * | | Reverting commit 3257 and renaming master_url to openshift_logging_master_urlewolinetz2017-02-079-30/+30
| | | |
* | | | Merge pull request #3323 from richm/missing-common-data-model-filterScott Dodson2017-02-091-0/+1
|\ \ \ \ | | | | | | | | | | Bug 1420234 - illegal_argument_exception in Kibana UI.
| * | | | Bug 1420234 - illegal_argument_exception in Kibana UI.Rich Megginson2017-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1420234 The problem is that the fluent.conf is missing the common data model filter which renames the "time" field to the "@timestamp" field.
* | | | | Merge pull request #3317 from sdodson/bz1393666Scott Dodson2017-02-093-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | Document openshift_cockpit_deployer_prefix and add
| * | | | Document openshift_cockpit_deployer_prefix and addScott Dodson2017-02-093-0/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | openshift_cockpit_deployer_version Fixes Bug 1393666
* | | | Merge pull request #3310 from ↵Jeff Cantrill2017-02-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jcantrill/bz_1420684_fix_namespace_on_logging_upgrade bug 1420684. On logging upgrade use the correct value for namespace
| * | | | bug 1420684. On logging upgrade use the correct value for namespaceJeff Cantrill2017-02-091-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3250 from kwoodson/oc_processKenny Woodson2017-02-098-1/+2381
|\ \ \ \ | |_|/ / |/| | | Adding oc_process to lib_openshift.
| * | | Fixing docs.Kenny Woodson2017-02-094-37/+100
| | | |
| * | | Fixing for linters.Kenny Woodson2017-02-093-18/+22
| | | |
| * | | Adding test cases.Kenny Woodson2017-02-095-27/+583
| | | |
| * | | Fixing docs.Kenny Woodson2017-02-093-8/+1459
| | | |
| * | | oc processIvan Horvath2017-02-094-0/+306
| |/ /
* | | Merge pull request #3312 from abutcher/embedded-etcd-bundleAndrew Butcher2017-02-092-0/+33
|\ \ \ | | | | | | | | Ensure embedded etcd config points to CA bundle.
| * | | Ensure embedded etcd config uses CA bundle.Andrew Butcher2017-02-092-0/+33
| |/ /
* | | Merge pull request #3298 from abutcher/infinite-initAndrew Butcher2017-02-091-8/+8
|\ \ \ | |/ / |/| | Bug 1419843 - Installation with ansible-2.2.1.0-2 may fail when set_fact for openshift_master
| * | Reference class instead of self.__class__ within super constructor to avoid ↵Andrew Butcher2017-02-081-8/+8
| | | | | | | | | | | | calling self forever.
* | | Merge pull request #3294 from jcantrill/fix_metrics_pv_varsJason DeTiberus2017-02-084-9/+9
|\ \ \ | | | | | | | | use pvc_size instead of pv_size for openshift_metrics since the role …
| * | | use pvc_size instead of pv_size for openshift_metrics since the role creates ↵Jeff Cantrill2017-02-084-9/+9
| |/ / | | | | | | | | | claims
* | | Merge pull request #3283 from kwoodson/router_portKenny Woodson2017-02-087-88/+434
|\ \ \ | | | | | | | | Adding test cases. Adding support for specifying port on route.
| * | | Fixing for flake8 spacing.Kenny Woodson2017-02-081-2/+1
| | | |
| * | | Fixing tests for linters.Kenny Woodson2017-02-082-100/+100
| | | |
| * | | Adding port support for route.Kenny Woodson2017-02-087-88/+435
| |/ /
* | | Merge pull request #3278 from abutcher/mixed-envScott Dodson2017-02-081-1/+1
|\ \ \ | | | | | | | | Bug 1364160 - facts collection for openshift.common.admin_binary does not seem to work in mixed environments
| * | | [openshift_ca] Reference client binary from openshift_ca_host.Andrew Butcher2017-02-071-1/+1
| | | |
* | | | Merge pull request #3284 from jcantrill/1419839_heapster_onlyScott Dodson2017-02-089-68/+90
|\ \ \ \ | | | | | | | | | | fixes 1419839. Install only heapster for openshift_metrics when heap…
| * | | | fixes 1419839. Install only heapster for openshift_metrics when heapster ↵Jeff Cantrill2017-02-089-68/+90
| | |_|/ | |/| | | | | | | | | | standalone flag is set
* | | | Merge pull request #3290 from kwoodson/tmp_admin_kubeconfigScott Dodson2017-02-0820-38/+241
|\ \ \ \ | |_|_|/ |/| | | Added tmpfile for kubeconfig. Fixed tests.
| * | | Added temporary kubeconfig file. Fixed tests to coincide with tmpfile.Kenny Woodson2017-02-0820-38/+109
| | | |
| * | | Adding code to copy kubeconfig before running oc commands.Kenny Woodson2017-02-0812-12/+144
|/ / /
* | | Merge pull request #3285 from twiest/fix_unittestsKenny Woodson2017-02-088-37/+156
|\ \ \ | | | | | | | | Fixed ansible module unit and integration tests and added runners.
| * | | Fixed ansible module unit and integration tests and added runners.Thomas Wiest2017-02-078-37/+156
| | | |
* | | | Merge pull request #3286 from twiest/fix_openshift_modules_temp_filesKenny Woodson2017-02-0817-237/+474
|\ \ \ \ | |/ / / |/| | | Changed lib_openshift to use real temporary files.
| * | | Changed lib_openshift to use real temporary files.Thomas Wiest2017-02-0817-237/+474
|/ / /
* | | Merge pull request #3282 from kwoodson/specify_wait_portKenny Woodson2017-02-071-0/+1
|\ \ \ | |/ / |/| | Specify a port for wait_for call on master upgrade.
| * | Moving to ansible variable.Kenny Woodson2017-02-071-1/+1
| | |
| * | Specifying port for wait_for call.Kenny Woodson2017-02-071-0/+1
|/ /
* | Merge pull request #3275 from sdodson/bz1419893Scott Dodson2017-02-071-1/+1
|\ \ | | | | | | Fix playbooks/byo/openshift_facts.yml include path
| * | Fix playbooks/byo/openshift_facts.yml include pathScott Dodson2017-02-071-1/+1
| | | | | | | | | | | | Fixes Bug 1419893
* | | Merge pull request #3260 from ashcrow/1395168Andrew Butcher2017-02-073-0/+34
|\ \ \ | |/ / |/| | Copies CloudFront pem file to registry hosts
| * | Copies CloudFront pem file to registry hostsSteve Milner2017-02-063-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change copies the CloudFront private key to registry hosts when the provider is set to s3 and CloudFront baseurl, privatekey, and keyparid are all provided. It also adds the following variable examples in the host inventory files: - openshift_hosted_registry_storage_s3_cloudfront_baseurl - openshift_hosted_registry_storage_s3_cloudfront_privatekeyfile - openshift_hosted_registry_storage_s3_cloudfront_keypairid See https://bugzilla.redhat.com/show_bug.cgi?id=1395168
* | | Merge pull request #3273 from rhcarvalho/missing-rolesScott Dodson2017-02-071-0/+1
|\ \ \ | | | | | | | | Add missing symlink to roles