summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix glusterfs checkpoint infoRussell Teague2017-12-011-1/+1
* Merge pull request #6282 from mtnbikenc/fix-include_roleScott Dodson2017-11-305-8/+5
|\
| * Correct usage of include_roleRussell Teague2017-11-275-8/+5
* | Merge pull request #6290 from tomassedovic/openstack-no-dnsScott Dodson2017-11-305-78/+45
|\ \
| * | Update the doc textTomas Sedovic2017-11-292-5/+6
| * | Use IP addresses for OpenStack nodesTomas Sedovic2017-11-285-78/+44
* | | Merge pull request #6307 from mgugino-upstream-stage/no-log-fixOpenShift Merge Robot2017-11-292-6/+6
|\ \ \
| * | | Fix no_log warnings for custom moduleMichael Gugino2017-11-282-6/+6
* | | | Merge pull request #5723 from mjudeikis/gluster-registry-backendScott Dodson2017-11-2914-48/+128
|\ \ \ \
| * | | | Add support for external glusterfs as registry backendMangirdas2017-11-2114-48/+128
* | | | | Merge pull request #6301 from mgugino-upstream-stage/project_cfg_factsOpenShift Merge Robot2017-11-284-41/+12
|\ \ \ \ \
| * | | | | Remove openshift_facts project_cfg_factsMichael Gugino2017-11-284-41/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #6073 from mjudeikis/fix_glusterfs_restartScott Dodson2017-11-281-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add check for gluterFS DS to stop restartsMangirdas2017-11-191-0/+10
| |/ / /
* | | | Merge pull request #6299 from mgugino-upstream-stage/dns-factsMichael Gugino2017-11-284-21/+5
|\ \ \ \
| * | | | Remove dns_port factMichael Gugino2017-11-284-21/+5
|/ / / /
* | | | Merge pull request #6295 from mtnbikenc/remove-etcd-fileRussell Teague2017-11-281-8/+0
|\ \ \ \
| * | | | Remove unused task file from etcd roleRussell Teague2017-11-281-8/+0
* | | | | Merge pull request #6269 from mgugino-upstream-stage/clock-dependsMichael Gugino2017-11-286-3/+4
|\ \ \ \ \
| * | | | | Remove openshift_clock from meta dependsMichael Gugino2017-11-276-3/+4
* | | | | | Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-nodeMichael Gugino2017-11-2817-124/+23
|\ \ \ \ \ \
| * | | | | | Combine openshift_node and openshift_node_dnsmasqMichael Gugino2017-11-2717-124/+23
* | | | | | | Merge pull request #6283 from mgugino-upstream-stage/schedulableMichael Gugino2017-11-285-21/+8
|\ \ \ \ \ \ \
| * | | | | | | remove schedulable from openshift_factsMichael Gugino2017-11-275-21/+8
| |/ / / / / /
* | | | | | | Merge pull request #6259 from adelton/issue-6255Michael Gugino2017-11-2832-43/+43
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | dist.iteritems() no longer exists in Python 3.Jan Pazdziora2017-11-2732-43/+43
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6280 from mgugino-upstream-stage/cli_imageScott Dodson2017-11-286-12/+13
|\ \ \ \ \ \
| * | | | | | Remove openshift.common.cli_imageMichael Gugino2017-11-276-12/+13
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6287 from zgalor/prom-version-updateScott Dodson2017-11-281-1/+1
|\ \ \ \ \ \
| * | | | | | Update prometheus to 2.0.0 GAZohar Galor2017-11-281-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6291 from ingvagabund/fix-typeScott Dodson2017-11-281-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix type in authroizeJan Chaloupka2017-11-281-2/+2
|/ / / / /
* | | | | Merge pull request #6284 from ashcrow/add-svc-catalog-inventory-docScott Dodson2017-11-271-0/+8
|\ \ \ \ \
| * | | | | inventory: Add example for service catalog varsSteve Milner2017-11-271-0/+8
| |/ / / /
* | | | | Merge pull request #6272 from abutcher/fix-env-factsScott Dodson2017-11-271-6/+19
|\ \ \ \ \
| * | | | | Fix openshift_env fact creation within openshift_facts.Andrew Butcher2017-11-271-6/+19
* | | | | | Merge pull request #6240 from mtnbikenc/include-deprecation-openshift-service...Russell Teague2017-11-276-12/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Include Deprecation - openshift-service-catalogRussell Teague2017-11-226-12/+12
* | | | | | Merge pull request #6271 from jarrpa/glusterblock-fixScott Dodson2017-11-272-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | GlusterFS: Remove extraneous line from glusterblock templateJose A. Rivera2017-11-272-2/+0
|/ / / / /
* | | | | Merge pull request #6199 from mgugino-upstream-stage/master_sys_containerMichael Gugino2017-11-274-7/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Simplify is_master_system_container logicMichael Gugino2017-11-274-7/+7
* | | | | Merge pull request #6143 from dabelenda/add_hostname_routesMichael Gugino2017-11-273-0/+11
|\ \ \ \ \
| * | | | | Remove spurrious file committed by errorDiego Abelenda2017-11-241-15/+0
| * | | | | Fix name of the service pointed to by hostnameDiego Abelenda2017-11-241-1/+1
| * | | | | Missed the default value after the variable name change...Diego Abelenda2017-11-241-1/+1
| * | | | | Change the name of the variable and explicitely document the namesDiego Abelenda2017-11-243-2/+19
| * | | | | Allow to set the hostname for routes to prometheus and alertmanagerDiego Abelenda2017-11-243-0/+9
* | | | | | Merge pull request #6185 from giuseppe/fix-additional-and-insecure-registries...Michael Gugino2017-11-271-6/+0
|\ \ \ \ \ \
| * | | | | | cri-o: honor additional and insecure registries againGiuseppe Scrivano2017-11-201-6/+0