summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6199 from mgugino-upstream-stage/master_sys_containerMichael Gugino2017-11-273-5/+7
|\ | | | | Simplify is_master_system_container logic
| * Simplify is_master_system_container logicMichael Gugino2017-11-273-5/+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-272-2/+3
|\ \ \ | | | | | | | | Remove is_openvswitch_system_container from facts
| * | | Remove is_openvswitch_system_container from factsMichael Gugino2017-11-222-2/+3
| | | | | | | | | | | | | | | | Simply logic for this variable.
* | | | Merge pull request #6227 from adelton/issue-5517Scott Dodson2017-11-241-2/+3
|\ \ \ \ | |_|_|/ |/| | | 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-221-1/+1
| | | | | | | | | | | | | | | | list the package with --installed.
* | | | Merge pull request #6231 from mtnbikenc/include-deprecation-openshift-masterRussell Teague2017-11-228-25/+22
|\ \ \ \ | | | | | | | | | | Include Deprecation - openshift-master
| * | | | Include Deprecation - openshift-masterRussell Teague2017-11-2219-52/+49
| | | | |
* | | | | Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-nodeRussell Teague2017-11-2220-64/+60
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - openshift-node
| * | | | | Include Deprecation - openshift-nodeRussell Teague2017-11-2220-64/+60
| | |_|/ / | |/| | |
* | | | | Merge pull request #6221 from mtnbikenc/consolidate-openshift-service-catalogRussell Teague2017-11-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Playbook Consolidation - openshift-service-catalog
| * | | | | Playbook Consolidation - openshift-service-catalogRussell Teague2017-11-221-1/+1
| | | | | |
* | | | | | Merge pull request #6236 from mtnbikenc/consolidate-openshift-provisionersRussell Teague2017-11-224-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-provisioners
| * | | | | | Playbook Consolidation - openshift-provisionersRussell Teague2017-11-224-10/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6235 from mtnbikenc/include-deprecation-openshift-prometheusRussell Teague2017-11-221-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include Deprecation - openshift-prometheus
| * | | | | | Include Deprecation - openshift-prometheusRussell Teague2017-11-221-2/+2
| |/ / / / /
* | | | | | Merge pull request #6090 from dustymabe/dustyMichael Gugino2017-11-221-9/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | hosted_registry: clean up tmp mount point and fstab
| * | | | | hosted_registry: clean up tmp mount point and fstabDusty Mabe2017-11-101-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #6004
* | | | | | Merge pull request #6225 from mtnbikenc/include-deprecation-openshift-etcdRussell Teague2017-11-2232-47/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include Deprecation - openshift-etcd
| * | | | | | Include Deprecation - openshift-etcdRussell Teague2017-11-2233-49/+48
| | | | | | |
* | | | | | | Merge pull request #6228 from mtnbikenc/include-deprecation-openshift-nfsRussell Teague2017-11-221-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include Deprecation - openshift-nfs
| * | | | | | | Include Deprecation - openshift-nfsRussell Teague2017-11-222-4/+3
| |/ / / / / /
* | | | | | | Merge pull request #6226 from mtnbikenc/include-deprecation-openshift-metricsRussell Teague2017-11-227-21/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include Deprecation - openshift-metrics
| * | | | | | | Include Deprecation - openshift-metricsRussell Teague2017-11-227-21/+21
| |/ / / / / /
* | | | | | | Merge pull request #6201 from mgugino-upstream-stage/system-regMichael Gugino2017-11-227-9/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix system_images_registry variable
| * | | | | | | Fix system_images_registry variableMichael Gugino2017-11-227-9/+26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Simplify the logic for this variable.
* | | | | | | Merge pull request #6220 from mtnbikenc/consolidate-openshift-managementScott Dodson2017-11-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Playbook Consolidation - openshift-management
| * | | | | | Playbook Consolidation - openshift-managementRussell Teague2017-11-221-1/+1
| | | | | | |
* | | | | | | Merge pull request #6224 from ↵Russell Teague2017-11-222-4/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-loadbalancer Include Deprecation - openshift-loadbalancer
| * | | | | | Include Deprecation - openshift-loadbalancerRussell Teague2017-11-222-4/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6151 from mtnbikenc/consolidate-openshift-masterRussell Teague2017-11-222-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-master
| * | | | | | Playbook Consolidation - openshift-masterRussell Teague2017-11-222-3/+3
| | | | | | |
* | | | | | | Merge pull request #6217 from mtnbikenc/consolidate-openshift-hostedRussell Teague2017-11-221-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Playbook Consolidation - openshift-hosted
| * | | | | | Playbook Consolidation - openshift-hostedRussell Teague2017-11-221-2/+2
| | | | | | |
* | | | | | | Merge pull request #6180 from zgalor/uninstall_prometheusScott Dodson2017-11-223-13/+22
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix uninstall option for prometheus
| * | | | | | Fix uninstall option for prometheusZohar Galor2017-11-203-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only remove prometheus namespace when uninstalling. This will remove all the contained objects. bz: https://bugzilla.redhat.com/show_bug.cgi?id=1492544
* | | | | | | Merge pull request #6193 from mgugino-upstream-stage/etc-runtimeMichael Gugino2017-11-224-5/+83
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Cleanup etcd runtime variable.
| * | | | | | Cleanup etcd runtime variable.Michael Gugino2017-11-214-5/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning out reference to etcd_runtime in openshift facts.
* | | | | | | Merge pull request #6152 from mtnbikenc/consolidate-openshift-metricsRussell Teague2017-11-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Playbook Consolidation - openshift-metrics