| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #6236 from mtnbikenc/consolidate-openshift-provisioners | Russell Teague | 2017-11-22 | 4 | -10/+10 |
| |\ | | | | | Playbook Consolidation - openshift-provisioners | ||||
| | * | Playbook Consolidation - openshift-provisioners | Russell Teague | 2017-11-22 | 4 | -10/+10 |
| | | | |||||
| * | | Merge pull request #6235 from mtnbikenc/include-deprecation-openshift-prometheus | Russell Teague | 2017-11-22 | 1 | -2/+2 |
| |\ \ | | | | | | | Include Deprecation - openshift-prometheus | ||||
| | * | | Include Deprecation - openshift-prometheus | Russell Teague | 2017-11-22 | 1 | -2/+2 |
| | |/ | |||||
| * | | Merge pull request #6090 from dustymabe/dusty | Michael Gugino | 2017-11-22 | 1 | -9/+2 |
| |\ \ | |/ |/| | hosted_registry: clean up tmp mount point and fstab | ||||
| | * | hosted_registry: clean up tmp mount point and fstab | Dusty Mabe | 2017-11-10 | 1 | -9/+2 |
| | | | | | | | | | Fixes #6004 | ||||
| * | | Merge pull request #6225 from mtnbikenc/include-deprecation-openshift-etcd | Russell Teague | 2017-11-22 | 32 | -47/+46 |
| |\ \ | | | | | | | Include Deprecation - openshift-etcd | ||||
| | * | | Include Deprecation - openshift-etcd | Russell Teague | 2017-11-22 | 33 | -49/+48 |
| | | | | |||||
| * | | | Merge pull request #6228 from mtnbikenc/include-deprecation-openshift-nfs | Russell Teague | 2017-11-22 | 1 | -2/+1 |
| |\ \ \ | | | | | | | | | Include Deprecation - openshift-nfs | ||||
| | * | | | Include Deprecation - openshift-nfs | Russell Teague | 2017-11-22 | 2 | -4/+3 |
| | |/ / | |||||
| * | | | Merge pull request #6226 from mtnbikenc/include-deprecation-openshift-metrics | Russell Teague | 2017-11-22 | 7 | -21/+21 |
| |\ \ \ | | | | | | | | | Include Deprecation - openshift-metrics | ||||
| | * | | | Include Deprecation - openshift-metrics | Russell Teague | 2017-11-22 | 7 | -21/+21 |
| | |/ / | |||||
| * | | | Merge pull request #6201 from mgugino-upstream-stage/system-reg | Michael Gugino | 2017-11-22 | 7 | -9/+26 |
| |\ \ \ | | | | | | | | | Fix system_images_registry variable | ||||
| | * | | | Fix system_images_registry variable | Michael Gugino | 2017-11-22 | 7 | -9/+26 |
| | |/ / | | | | | | | | | | Simplify the logic for this variable. | ||||
| * | | | Merge pull request #6220 from mtnbikenc/consolidate-openshift-management | Scott Dodson | 2017-11-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Playbook Consolidation - openshift-management | ||||
| | * | | | Playbook Consolidation - openshift-management | Russell Teague | 2017-11-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #6224 from ↵ | Russell Teague | 2017-11-22 | 2 | -4/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-loadbalancer Include Deprecation - openshift-loadbalancer | ||||
| | * | | | | Include Deprecation - openshift-loadbalancer | Russell Teague | 2017-11-22 | 2 | -4/+3 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #6151 from mtnbikenc/consolidate-openshift-master | Russell Teague | 2017-11-22 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Playbook Consolidation - openshift-master | ||||
| | * | | | | Playbook Consolidation - openshift-master | Russell Teague | 2017-11-22 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #6217 from mtnbikenc/consolidate-openshift-hosted | Russell Teague | 2017-11-22 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Playbook Consolidation - openshift-hosted | ||||
| | * | | | | | Playbook Consolidation - openshift-hosted | Russell Teague | 2017-11-22 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | 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 #6193 from mgugino-upstream-stage/etc-runtime | Michael Gugino | 2017-11-22 | 4 | -5/+83 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Cleanup etcd runtime variable. | ||||
| | * | | | | | Cleanup etcd runtime variable. | Michael Gugino | 2017-11-21 | 4 | -5/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning out reference to etcd_runtime in openshift facts. | ||||
| * | | | | | | Merge pull request #6152 from mtnbikenc/consolidate-openshift-metrics | Russell Teague | 2017-11-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Playbook Consolidation - openshift-metrics | ||||
| | * | | | | | Playbook Consolidation - openshift-metrics | Russell Teague | 2017-11-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancer | Russell Teague | 2017-11-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Playbook Consolidation - openshift-loadbalancer | ||||
| | * | | | | | Playbook Consolidation - openshift-loadbalancer | Russell Teague | 2017-11-16 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #6200 from mgugino-upstream-stage/node-sys-container | Michael Gugino | 2017-11-21 | 3 | -3/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix node system container var | ||||
| | * | | | | | Fix node system container var | Michael Gugino | 2017-11-21 | 3 | -3/+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 | 8 | -14/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Include Deprecation - Init Playbook Paths | ||||
| | * | | | | | | Include Deprecation - Init Playbook Paths | Russell Teague | 2017-11-16 | 8 | -14/+14 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Playbook Consolidation - openshift-node | Russell Teague | 2017-11-21 | 1 | -1/+1 |
| | |_|/ / / |/| | | | | |||||
| * | | | | | Merge pull request #6145 from mtnbikenc/consolidate-openshift-etcd | Scott Dodson | 2017-11-21 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Playbook Consolidation - openshift-etcd | ||||
| | * | | | | | Playbook Consolidation - openshift-etcd | Russell Teague | 2017-11-16 | 2 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | 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 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Playbook Consolidation - openshift-nfs | ||||
| | * | | | | | Playbook Consolidation - openshift-nfs | Russell Teague | 2017-11-16 | 2 | -2/+2 |
| | | |/ / / | |/| | | | |||||
| * | | | | | 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 | ||||
| * / / / | Only remove empty keys from env if env exists | Scott Dodson | 2017-11-20 | 1 | -1/+2 |
| |/ / / | |||||
| * | | | Merge pull request #5652 from ruromero/bz1498398 | OpenShift Merge Robot | 2017-11-18 | 2 | -0/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add enclosing <store> tags to sample secure-forward.conf files This fixes [BZ#1498398](https://bugzilla.redhat.com/show_bug.cgi?id=1498398) The examples provided in the documentation to configure the secure forward mention the configuration must be enclosed between the <store> tag. For that I think the examples should include it as well. See [3.6 Documentation](https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html#aggregated-fluentd) ~~~ <store> @type secure_forward self_hostname pod-${HOSTNAME} shared_key thisisasharedkey secure yes enable_strict_verification yes ca_cert_path /etc/fluent/keys/your_ca_cert ca_private_key_path /etc/fluent/keys/your_private_key ca_private_key_passphrase passphrase <server> host ose1.example.com port 24284 </server> <server> host ose2.example.com port 24284 standby </server> <server> host ose3.example.com port 24284 standby </server> </store> ~~~ | ||||
| | * | | | bug 1498398. Enclose content between store tag | Ruben Romero Montes | 2017-10-04 | 2 | -0/+4 |
| | | | | | |||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. | Suren A. Chilingaryan |
| summaryrefslogtreecommitdiffstats |