Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6201 from mgugino-upstream-stage/system-reg | Michael Gugino | 2017-11-22 | 8 | -24/+26 |
|\ | | | | | Fix system_images_registry variable | ||||
| * | Fix system_images_registry variable | Michael Gugino | 2017-11-22 | 8 | -24/+26 |
| | | | | | | | | Simplify the logic for this variable. | ||||
* | | Merge pull request #6157 from mtnbikenc/consolidate-openshift-glusterfs | Scott Dodson | 2017-11-22 | 15 | -13/+10 |
|\ \ | | | | | | | Playbook Consolidation - openshift-glusterfs | ||||
| * | | Playbook Consolidation - openshift-glusterfs | Russell Teague | 2017-11-16 | 15 | -13/+10 |
| | | | |||||
* | | | Merge pull request #6220 from mtnbikenc/consolidate-openshift-management | Scott Dodson | 2017-11-22 | 18 | -14/+14 |
|\ \ \ | | | | | | | | | Playbook Consolidation - openshift-management | ||||
| * | | | Playbook Consolidation - openshift-management | Russell Teague | 2017-11-22 | 18 | -14/+14 |
| | | | | |||||
* | | | | Merge pull request #6224 from ↵ | Russell Teague | 2017-11-22 | 3 | -6/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-loadbalancer Include Deprecation - openshift-loadbalancer | ||||
| * | | | | Include Deprecation - openshift-loadbalancer | Russell Teague | 2017-11-22 | 3 | -6/+5 |
| | | | | | |||||
* | | | | | Merge pull request #6151 from mtnbikenc/consolidate-openshift-master | Russell Teague | 2017-11-22 | 44 | -48/+45 |
|\ \ \ \ \ | | | | | | | | | | | | | Playbook Consolidation - openshift-master | ||||
| * | | | | | Playbook Consolidation - openshift-master | Russell Teague | 2017-11-22 | 44 | -48/+45 |
| | | | | | | |||||
* | | | | | | Merge pull request #6217 from mtnbikenc/consolidate-openshift-hosted | Russell Teague | 2017-11-22 | 18 | -16/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Playbook Consolidation - openshift-hosted | ||||
| * | | | | | | Playbook Consolidation - openshift-hosted | Russell Teague | 2017-11-22 | 18 | -16/+21 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6180 from zgalor/uninstall_prometheus | Scott Dodson | 2017-11-22 | 3 | -13/+22 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Fix uninstall option for prometheus | ||||
| * | | | | | | Fix uninstall option for prometheus | Zohar Galor | 2017-11-20 | 3 | -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/prerequisites | Michael Gugino | 2017-11-22 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Place-holder for prerequisites.yml | ||||
| * | | | | | | Place-holder for prerequisites.yml | Michael Gugino | 2017-11-21 | 1 | -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-runtime | Michael Gugino | 2017-11-22 | 17 | -104/+92 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Cleanup etcd runtime variable. | ||||
| * | | | | | | Cleanup etcd runtime variable. | Michael Gugino | 2017-11-21 | 17 | -104/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning out reference to etcd_runtime in openshift facts. | ||||
* | | | | | | | Merge pull request #6152 from mtnbikenc/consolidate-openshift-metrics | Russell Teague | 2017-11-22 | 8 | -7/+9 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Playbook Consolidation - openshift-metrics | ||||
| * | | | | | | Playbook Consolidation - openshift-metrics | Russell Teague | 2017-11-16 | 8 | -7/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancer | Russell Teague | 2017-11-22 | 11 | -9/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Playbook Consolidation - openshift-loadbalancer | ||||
| * | | | | | | Playbook Consolidation - openshift-loadbalancer | Russell Teague | 2017-11-16 | 11 | -9/+9 |
| |/ / / / / | |||||
* | | | | / | Automatic commit of package [openshift-ansible] release [3.8.0-0.9.0]. | Jenkins CD Merge Bot | 2017-11-22 | 2 | -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-container | Michael Gugino | 2017-11-21 | 4 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix node system container var | ||||
| * | | | | | Fix node system container var | Michael Gugino | 2017-11-21 | 4 | -5/+5 |
| | |/ / / | |/| | | | | | | | | | | | | | Fix logic, make it simpler. | ||||
* | | | | | Merge pull request #6204 from richm/mux-int-port | Luke Meyer | 2017-11-21 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | mux containerPort must be an int not a string | ||||
| * | | | | | containerPort must be an int; correctly quote/brace replicas value | Rich Megginson | 2017-11-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mux containerPort must be an int The eventrouter REPLICAS must use the double quote/double brace syntax documented here: https://docs.openshift.org/latest/dev_guide/templates.html#writing-parameters And must be escaped because it uses double braces, as explained here: http://jinja.pocoo.org/docs/dev/templates/#escaping | ||||
* | | | | | | Merge pull request #6144 from mtnbikenc/init-include-deprecation | Russell Teague | 2017-11-21 | 10 | -22/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Include Deprecation - Init Playbook Paths | ||||
| * | | | | | | Include Deprecation - Init Playbook Paths | Russell Teague | 2017-11-16 | 10 | -22/+21 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6158 from mtnbikenc/consolidate-openshift-node | Russell Teague | 2017-11-21 | 37 | -33/+33 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Playbook Consolidation - openshift-node | ||||
| * | | | | | Add temporary playbook for CI test functionality | Russell Teague | 2017-11-21 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Playbook Consolidation - openshift-node | Russell Teague | 2017-11-21 | 37 | -34/+31 |
| | | | | | | |||||
* | | | | | | Merge pull request #6202 from mgugino-upstream-stage/fix-any-sys-containers | Michael Gugino | 2017-11-21 | 1 | -5/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix logic for any sys containers | ||||
| * | | | | | Fix logic for any sys containers | Michael Gugino | 2017-11-21 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Remove set_fact in favor of the variables directly. | ||||
* | | | | | | Merge pull request #6209 from jlebon/pr/use-env-var | Scott Dodson | 2017-11-21 | 1 | -19/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | papr: use new PAPR_PULL_TARGET_BRANCH | ||||
| * | | | | | | papr: use new PAPR_PULL_TARGET_BRANCH | Jonathan Lebon | 2017-11-21 | 1 | -19/+1 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PAPR now provides pull request tests with the branch that the test is targeting. Let's use that instead of querying the GitHub API and possibly running through the unauthenticated limit. | ||||
* | | | | | | Merge pull request #6145 from mtnbikenc/consolidate-openshift-etcd | Scott Dodson | 2017-11-21 | 35 | -41/+38 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Playbook Consolidation - openshift-etcd | ||||
| * | | | | | | Playbook Consolidation - openshift-etcd | Russell Teague | 2017-11-16 | 35 | -41/+38 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6175 from zgalor/tunable_prometheus | Scott Dodson | 2017-11-21 | 3 | -2/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow modifying and adding prometheus application arguments | ||||
| * | | | | | | Allow modifying and adding prometheus application arguments | Zohar Galor | 2017-11-19 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.file and web.listen-address remain unconfigurable (Changing those will break deployment) Storage defaults moved to a list parameter `openshift_prometheus_args` that can be modified and extended. | ||||
* | | | | | | | Merge pull request #6148 from mtnbikenc/consolidate-openshift-nfs | Scott Dodson | 2017-11-21 | 10 | -8/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Playbook Consolidation - openshift-nfs | ||||
| * | | | | | | | Playbook Consolidation - openshift-nfs | Russell Teague | 2017-11-16 | 10 | -8/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6186 from jarrpa/glusterfs-files-3.8 | Scott Dodson | 2017-11-21 | 13 | -0/+883 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | GlusterFS: Files and templates for 3.8 | ||||
| * | | | | | | | GlusterFS: Files and templates for 3.8 | Jose A. Rivera | 2017-11-20 | 13 | -0/+883 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | | | Merge pull request #6197 from mgugino-upstream-stage/etcd-image | Scott Dodson | 2017-11-21 | 6 | -12/+10 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Refactor etcd image | ||||
| * | | | | | | Refactor etcd image | Michael Gugino | 2017-11-20 | 6 | -12/+10 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Simplify logic for etcd_image | ||||
* | | | | | | Merge pull request #6184 from sdodson/bz1469387 | Scott Dodson | 2017-11-21 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Only remove empty keys from env if env exists | ||||
| * | | | | | Only remove empty keys from env if env exists | Scott Dodson | 2017-11-20 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #6183 from sdodson/etcd-32 | OpenShift Merge Robot | 2017-11-20 | 1 | -0/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Upgrade to etcd 3.2 It's got wonderful fixes that we'd enjoy having. | ||||
| * | | | | | Upgrade to etcd 3.2 | Scott Dodson | 2017-11-20 | 1 | -0/+8 |
| |/ / / / |