summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Include Deprecation - openshift-prometheusRussell Teague2017-11-222-4/+4
| |/ / /
* | | | 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-2243-70/+69
|\ \ \ \ | | | | | | | | | | Include Deprecation - openshift-etcd
| * | | | Include Deprecation - openshift-etcdRussell Teague2017-11-2244-72/+71
| | | | |
* | | | | Merge pull request #6223 from mtnbikenc/include-deprecation-openshift-checksRussell Teague2017-11-223-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - openshift-checks
| * | | | | Include Deprecation - openshift-checksRussell Teague2017-11-223-6/+6
| |/ / / /
* | | | | Merge pull request #6228 from mtnbikenc/include-deprecation-openshift-nfsRussell Teague2017-11-222-4/+3
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - openshift-nfs
| * | | | | Include Deprecation - openshift-nfsRussell Teague2017-11-223-6/+5
| |/ / / /
* | | | | Merge pull request #6226 from mtnbikenc/include-deprecation-openshift-metricsRussell Teague2017-11-228-23/+23
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - openshift-metrics
| * | | | | Include Deprecation - openshift-metricsRussell Teague2017-11-228-23/+23
| |/ / / /
* | | | | Merge pull request #6230 from mtnbikenc/include-deprecation-openshift-hostedRussell Teague2017-11-222-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - openshift-hosted
| * | | | | Include Deprecation - openshift-hostedRussell Teague2017-11-222-9/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6201 from mgugino-upstream-stage/system-regMichael Gugino2017-11-228-24/+26
|\ \ \ \ \ | | | | | | | | | | | | Fix system_images_registry variable
| * | | | | Fix system_images_registry variableMichael Gugino2017-11-228-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | Simplify the logic for this variable.
* | | | | | Merge pull request #6157 from mtnbikenc/consolidate-openshift-glusterfsScott Dodson2017-11-2215-13/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-glusterfs
| * | | | | | Playbook Consolidation - openshift-glusterfsRussell Teague2017-11-1615-13/+10
| | | | | | |
* | | | | | | Merge pull request #6220 from mtnbikenc/consolidate-openshift-managementScott Dodson2017-11-2218-14/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Playbook Consolidation - openshift-management
| * | | | | | Playbook Consolidation - openshift-managementRussell Teague2017-11-2218-14/+14
| | | | | | |
* | | | | | | Merge pull request #6224 from ↵Russell Teague2017-11-223-6/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-loadbalancer Include Deprecation - openshift-loadbalancer
| * | | | | | Include Deprecation - openshift-loadbalancerRussell Teague2017-11-223-6/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6151 from mtnbikenc/consolidate-openshift-masterRussell Teague2017-11-2244-48/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - openshift-master
| * | | | | | Playbook Consolidation - openshift-masterRussell Teague2017-11-2244-48/+45
| | | | | | |
* | | | | | | Merge pull request #6217 from mtnbikenc/consolidate-openshift-hostedRussell Teague2017-11-2218-16/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Playbook Consolidation - openshift-hosted
| * | | | | | | Playbook Consolidation - openshift-hostedRussell Teague2017-11-2218-16/+21
| | | | | | | |
* | | | | | | | 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 #6188 from mgugino-upstream-stage/prerequisitesMichael Gugino2017-11-221-0/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Place-holder for prerequisites.yml
| * | | | | | | Place-holder for prerequisites.ymlMichael Gugino2017-11-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this file to be in place to add an additional step to the CI jobs. In subsequent PRs, we can add steps into this file.
* | | | | | | | Merge pull request #6193 from mgugino-upstream-stage/etc-runtimeMichael Gugino2017-11-2217-104/+92
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Cleanup etcd runtime variable.
| * | | | | | | Cleanup etcd runtime variable.Michael Gugino2017-11-2117-104/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning out reference to etcd_runtime in openshift facts.
* | | | | | | | Merge pull request #6152 from mtnbikenc/consolidate-openshift-metricsRussell Teague2017-11-228-7/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Playbook Consolidation - openshift-metrics
| * | | | | | | Playbook Consolidation - openshift-metricsRussell Teague2017-11-168-7/+9
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancerRussell Teague2017-11-2211-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Playbook Consolidation - openshift-loadbalancer
| * | | | | | | Playbook Consolidation - openshift-loadbalancerRussell Teague2017-11-1611-9/+9
| |/ / / / / /
* | | | | / / Automatic commit of package [openshift-ansible] release [3.8.0-0.9.0].Jenkins CD Merge Bot2017-11-222-2/+20
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | Merge pull request #6200 from mgugino-upstream-stage/node-sys-containerMichael Gugino2017-11-214-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix node system container var