summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4248 from abutcher/sysctl-workaroundOpenShift Bot2017-05-232-1/+10
|\ | | | | Merged by openshift-bot
| * Workaround sysctl module issue with py3 by converting task to lineinfile.Andrew Butcher2017-05-192-1/+10
| |
* | Merge pull request #4243 from jarrpa/template-paramsOpenShift Bot2017-05-2228-28/+28
|\ \ | | | | | | Merged by openshift-bot
| * | lib/base: Allow for more complex template paramsJose A. Rivera2017-05-1928-28/+28
| |/ | | | | | | | | | | | | This change allows for the specification of JSON objects like lists as parameters to templates. Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | Merge pull request #3982 from jim-minter/trello131-broker-configurationOpenShift Bot2017-05-223-0/+15
|\ \ | | | | | | Merged by openshift-bot
| * | add template service broker configurableJim Minter2017-04-243-0/+15
| | |
* | | Merge pull request #4228 from etsauer/s3-required-varsScott Dodson2017-05-222-4/+4
|\ \ \ | | | | | | | | Removing requirement to pass aws credentials
| * | | Removing requirement to pass aws credentialsEric Sauer2017-05-222-4/+4
| | | |
* | | | Merge pull request #4220 from pat2man/openshift_hosted_metrics_deployer_versionEric Wolinetz2017-05-222-0/+6
|\ \ \ \ | | | | | | | | | | Update examples to include metrics deployer version
| * | | | Update hosts.*.example to include openshift_hosted_metrics_deployer_versionPatrick Tescher2017-05-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this we can have a mismatch between the OpenShift version and the metrics version. Fixes https://github.com/openshift/origin/issues/13532
* | | | | Merge pull request #4217 from ingvagabund/move-etcd-upgrade-code-into-roleJan Chaloupka2017-05-2122-198/+270
|\ \ \ \ \ | | | | | | | | | | | | Move etcd upgrade code into role
| * | | | | move etcd upgrade related code into etcd_upgrade roleJan Chaloupka2017-05-1822-198/+270
| | | | | |
* | | | | | Merge pull request #4226 from mtnbikenc/fix-auditConfigOpenShift Bot2017-05-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Fix auditConfig for non-HA environmentsRussell Teague2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1447019
* | | | | | | Merge pull request #4134 from ewolinetz/issue4111OpenShift Bot2017-05-191-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Adding assert to check for python-passlib on control hostewolinetz2017-05-111-0/+8
| | | | | | | |
* | | | | | | | Merge pull request #4211 from dmsimard/github_teamsOpenShift Bot2017-05-191-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Add teams attribute to github identity providerDavid Moreau-Simard2017-05-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHubIdentityProvider provides the ability to authenticate against GitHub organization teams [1]. This adds the attribute as optional so that users do not get the error "provider GitHubIdentityProvider contains unknown keys teams". [1]: https://docs.openshift.com/container-platform/3.5/install_config/configuring_authentication.html#GitHub
* | | | | | | | | Merge pull request #4249 from ashcrow/router-certificate-nameScott Dodson2017-05-192-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | inventory: rename certificates->certificate in router example
| * | | | | | | | | inventory: rename certificates->certificate in router exampleSteve Milner2017-05-192-4/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per change 9397727e433cbd9bfd865fb5ad773c7b6b4590e8, router replaced certificates with certificate.
* | | | | | | | | Merge pull request #4175 from codificat/20170512-img-build-updatesOpenShift Bot2017-05-195-9/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Fix container image build referencesPep Turró Mauri2017-05-125-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating some files to account for recent changes: - Commit fbadeb4 moved the location of the Dockerfiles - playbook2image is now available from the openshift org - downstream image is building with boto 2.34 Adjusting image build scripts and documentation to match these changes.
* | | | | | | | | | Merge pull request #3630 from juanvallejo/jvallejo/add-etcd-volume-checkOpenShift Bot2017-05-192-0/+207
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Merged by openshift-bot
| * | | | | | | | | revert role-specific var namejuanvallejo2017-05-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'jvallejo/add-etcd-volume-check' of ↵juanvallejo2017-05-121-5/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:juanvallejo/openshift-ansible into jvallejo/add-etcd-volume-check
| | * | | | | | | | | Update variable name to standardRodolfo Carvalho2017-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was agreed to name role variables as `r_ROLE_NAME_VARIABLE_NAME`. Giving it a try.
| | * | | | | | | | | Make class attribute name shorterRodolfo Carvalho2017-05-111-4/+4
| | | | | | | | | | |
| | * | | | | | | | | Add module docstringRodolfo Carvalho2017-05-111-0/+2
| | | | | | | | | | |
| * | | | | | | | | | check if hostname is in list of etcd hostsjuanvallejo2017-05-121-3/+4
| |/ / / / / / / / /
| * | | | | | | | | Update checkRodolfo Carvalho2017-05-102-48/+46
| | | | | | | | | |
| * | | | | | | | | int -> floatRodolfo Carvalho2017-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to convert to int and then to float. Read it as float from the start.
| * | | | | | | | | Remove vim lineRodolfo Carvalho2017-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been agreed that we don't use it any longer.
| * | | | | | | | | add etcd volume checkjuanvallejo2017-05-092-0/+207
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4235 from sdodson/fix-yamllintScott Dodson2017-05-191-8/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Fix yamllint problems
| * | | | | | | | | Fix yamllint problemsScott Dodson2017-05-191-8/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | I should've noticed before merging...
* | | | | | | | | Merge pull request #4073 from richm/logging-es-routeScott Dodson2017-05-195-0/+205
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add ability to expose Elasticsearch as an external route
| * | | | | | | | | add ability to expose Elasticsearch as an external routeRich Megginson2017-05-185-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to expose Elastisearch as a route outside of the cluster. - `openshift_logging_es_allow_external`: True (default is False) - if this is True, Elasticsearch will be exposed as a Route - `openshift_logging_es_ops_hostname`: The external facing hostname to use for the route and the TLS server certificate (default is "es." + `openshift_master_default_subdomain`) There are other similar parameters for the TLS server cert, key, and CA cert. There are other similar parameters for when the OPS cluster is deployed e.g. `openshift_logging_es_ops_allow_external`, etc.
* | | | | | | | | | Merge pull request #4094 from ashcrow/status-doesnt-existJan Chaloupka2017-05-192-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ensure good return code for specific until loops
| * | | | | | | | | | Ensure good return code for specific until loopsSteve Milner2017-05-042-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4128 from VincentS/Container_Registry_FirewalldJan Chaloupka2017-05-192-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added Container Registry Port 5000 to Firewalld
| * | | | | | | | | | | Added Docker Registry Port 5000 to FirewalldVincent Schwarzer2017-05-182-0/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4145 from VincentS/Calico_ParameterizationJan Chaloupka2017-05-194-3/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Parameterized Calico/Node Arguments
| * | | | | | | | | | | | Parameterized Calico/Node ArgumentsVincent Schwarzer2017-05-184-3/+32
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #4125 from VincentS/Calico_BGP_PortJan Chaloupka2017-05-192-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added Calico BGP Port 179 to Firewalld
| * | | | | | | | | | | | Added Calico BGP Port 179 to FirewalldVincent Schwarzer2017-05-152-0/+9
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4224 from VincentS/LocalTMPDir_FixOpenShift Bot2017-05-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | | | Localhost TMP Dir FixVincent Schwarzer2017-05-181-0/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4218 from abutcher/uninstall-container-engine-dockerOpenShift Bot2017-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | | | Uninstall: restart docker when container-engine restart hasn't changed.Andrew Butcher2017-05-171-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3660 from juanvallejo/jvallejo/add-etcd-clustersize-checkOpenShift Bot2017-05-183-0/+534
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | Merged by openshift-bot