summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Multimaster openshift+contiv fixesLance Dillon2017-11-294-3/+29
| | | | | | | Only run default contiv commands once Fix detection of firewalld Open up netmaster ports to all nodes Make sure etcd ca stuff only runs once
* Merge pull request #6307 from mgugino-upstream-stage/no-log-fixOpenShift Merge Robot2017-11-292-6/+6
|\ | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix no_log warnings for custom module We need to set no_log for password and private_key variables.
| * Fix no_log warnings for custom moduleMichael Gugino2017-11-282-6/+6
| | | | | | | | | | We need to set no_log for password and private_key variables.
* | Merge pull request #5723 from mjudeikis/gluster-registry-backendScott Dodson2017-11-2914-48/+128
|\ \ | | | | | | Add external glusterfs backend to hosted and glusterfs playbook
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove openshift_facts project_cfg_facts
| * | | Remove openshift_facts project_cfg_factsMichael Gugino2017-11-284-41/+12
| | |/ | |/| | | | | | | This simplifies some variable logic.
* | | Merge pull request #6073 from mjudeikis/fix_glusterfs_restartScott Dodson2017-11-281-0/+10
|\ \ \ | |/ / |/| | fix for Gluster force restart
| * | 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 fact
| * | Remove dns_port factMichael Gugino2017-11-284-21/+5
|/ / | | | | | | Simply dns_port variable by remove from openshift_facts.
* | Merge pull request #6295 from mtnbikenc/remove-etcd-fileRussell Teague2017-11-281-8/+0
|\ \ | | | | | | Remove unused task file from etcd role
| * | 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 depends
| * | | Remove openshift_clock from meta dependsMichael Gugino2017-11-276-3/+4
| | | | | | | | | | | | | | | | | | | | This commit adds openshift_clock role to required plays instead of using meta_depends.
* | | | Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-nodeMichael Gugino2017-11-2817-124/+23
|\ \ \ \ | | | | | | | | | | Combine openshift_node and openshift_node_dnsmasq
| * | | | Combine openshift_node and openshift_node_dnsmasqMichael Gugino2017-11-2717-124/+23
| | | | | | | | | | | | | | | | | | | | | | | | | This commit combines these two roles. This will prevent openshift_node_facts from running twice.
* | | | | Merge pull request #6283 from mgugino-upstream-stage/schedulableMichael Gugino2017-11-285-21/+8
|\ \ \ \ \ | | | | | | | | | | | | remove schedulable from openshift_facts
| * | | | | remove schedulable from openshift_factsMichael Gugino2017-11-275-21/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory.
* | | | | Merge pull request #6259 from adelton/issue-6255Michael Gugino2017-11-2832-43/+43
|\ \ \ \ \ | |_|_|/ / |/| | | | dist.iteritems() no longer exists in Python 3.
| * | | | 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_image
| * | | | | Remove openshift.common.cli_imageMichael Gugino2017-11-276-12/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This commit removes openshift.common.cli_image in favor of openshift_cli_image.
* | | | | Merge pull request #6287 from zgalor/prom-version-updateScott Dodson2017-11-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update prometheus to 2.0.0 GA
| * | | | | 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 authroize
| * | | | | 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 vars
| * | | | | inventory: Add example for service catalog varsSteve Milner2017-11-271-0/+8
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | Merge pull request #6272 from abutcher/fix-env-factsScott Dodson2017-11-271-6/+19
|\ \ \ \ \ | | | | | | | | | | | | Fix openshift_env fact creation within openshift_facts.
| * | | | | Fix openshift_env fact creation within openshift_facts.Andrew Butcher2017-11-271-6/+19
| | | | | |
* | | | | | Merge pull request #6240 from ↵Russell Teague2017-11-276-12/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-service-catalog Include Deprecation - openshift-service-catalog
| * | | | | 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 template
| * | | | | GlusterFS: Remove extraneous line from glusterblock templateJose A. Rivera2017-11-272-2/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | Merge pull request #6199 from mgugino-upstream-stage/master_sys_containerMichael Gugino2017-11-274-7/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Simplify is_master_system_container logic
| * | | | Simplify is_master_system_container logicMichael Gugino2017-11-274-7/+7
| | | | | | | | | | | | | | | | | | | | Simplify the variable is_master_system_container
* | | | | Merge pull request #6143 from dabelenda/add_hostname_routesMichael Gugino2017-11-273-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Allow to set the hostname for routes to prometheus and alertmanager
| * | | | | 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 ↵Michael Gugino2017-11-271-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | giuseppe/fix-additional-and-insecure-registries-for-crio cri-o: honor additional and insecure registries again
| * | | | | | cri-o: honor additional and insecure registries againGiuseppe Scrivano2017-11-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced with: https://github.com/openshift/openshift-ansible/commit/ee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #6178 from giuseppe/copy-docker-to-alt-storage-pathMichael Gugino2017-11-271-4/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | docker: copy Docker metadata to the alternative storage path
| * | | | | | docker: copy Docker metadata to the alternative storage pathGiuseppe Scrivano2017-11-201-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #6198 from mgugino-upstream-stage/openvswitch-sys-containerMichael Gugino2017-11-273-4/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove is_openvswitch_system_container from facts
| * | | | | Remove is_openvswitch_system_container from factsMichael Gugino2017-11-223-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Simply logic for this variable.
* | | | | | Merge pull request #6134 from fraenkel/allow_falseScott Dodson2017-11-242-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow openshift_install_examples to be false