summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | Allow openshift_install_examples to be falseMichael Fraenkel2017-11-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | when using yaml or json, a false value is converted to true
* | | | | | Merge pull request #6227 from adelton/issue-5517Scott Dodson2017-11-243-3/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Workaround the fact that package state=present with dnf fails for already installed but excluded packages.
| * | | | | Workaround the fact that package state=present with dnf fails for already ↵Jan Pazdziora2017-11-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | installed but excluded packages.
| * | | | | With dnf repoquery and excluded packages, --disableexcludes=all is needed to ↵Jan Pazdziora2017-11-223-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | list the package with --installed.
* | | | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.13.0].Jenkins CD Merge Bot2017-11-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.12.0].Jenkins CD Merge Bot2017-11-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.11.0].Jenkins CD Merge Bot2017-11-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.10.0].Jenkins CD Merge Bot2017-11-232-2/+30
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6241 from sosiouxme/20171122-tox-iniLuke Meyer2017-11-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | tox.ini: simplify unit test reqs
| * | | | | tox.ini: simplify unit test reqsLuke Meyer2017-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using a command to install ooinstall in the venv, just do so as part of creation and leave the command to just run unit tests.
* | | | | | Merge pull request #6237 from mtnbikenc/remove-unused-tasksRussell Teague2017-11-223-41/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused task files
| * | | | | | Remove unused task filesRussell Teague2017-11-223-41/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6232 from mtnbikenc/include-deprecation-openshift-glusterfsRussell Teague2017-11-223-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include Deprecation - openshift-glusterfs
| * | | | | | Include Deprecation - openshift-glusterfsRussell Teague2017-11-223-5/+5
| |/ / / / /
* | | | | | Merge pull request #6233 from mtnbikenc/include-deprecation-openshift-managementRussell Teague2017-11-223-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include Deprecation - openshift-management
| * | | | | | Include Deprecation - openshift-managementRussell Teague2017-11-223-5/+5
| |/ / / / /
* | | | | | Merge pull request #6231 from mtnbikenc/include-deprecation-openshift-masterRussell Teague2017-11-2219-51/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include Deprecation - openshift-master
| * | | | | | Include Deprecation - openshift-masterRussell Teague2017-11-2230-78/+74
| | | | | | |
* | | | | | | Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-nodeRussell Teague2017-11-2229-91/+87
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Include Deprecation - openshift-node
| * | | | | | Include Deprecation - openshift-nodeRussell Teague2017-11-2229-91/+87
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6221 from mtnbikenc/consolidate-openshift-service-catalogRussell Teague2017-11-227-12/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-service-catalog
| * | | | | | Playbook Consolidation - openshift-service-catalogRussell Teague2017-11-227-12/+8
| | | | | | |
* | | | | | | Merge pull request #6236 from mtnbikenc/consolidate-openshift-provisionersRussell Teague2017-11-228-14/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Playbook Consolidation - openshift-provisioners
| * | | | | | | Playbook Consolidation - openshift-provisionersRussell Teague2017-11-228-14/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6235 from mtnbikenc/include-deprecation-openshift-prometheusRussell Teague2017-11-222-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include Deprecation - openshift-prometheus