summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Playbook Consolidation - openshift-metricsRussell Teague2017-11-161-1/+1
| | | | |
* | | | | Merge pull request #6146 from mtnbikenc/consolidate-openshift-loadbalancerRussell Teague2017-11-221-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Playbook Consolidation - openshift-loadbalancer
| * | | | Playbook Consolidation - openshift-loadbalancerRussell Teague2017-11-161-1/+1
| |/ / /
* | | | Merge pull request #6200 from mgugino-upstream-stage/node-sys-containerMichael Gugino2017-11-213-3/+5
|\ \ \ \ | | | | | | | | | | Fix node system container var
| * | | | Fix node system container varMichael Gugino2017-11-213-3/+5
| | |/ / | |/| | | | | | | | | | Fix logic, make it simpler.
* | | | Merge pull request #6204 from richm/mux-int-portLuke Meyer2017-11-212-2/+2
|\ \ \ \ | | | | | | | | | | mux containerPort must be an int not a string
| * | | | containerPort must be an int; correctly quote/brace replicas valueRich Megginson2017-11-212-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-deprecationRussell Teague2017-11-218-14/+14
|\ \ \ \ \ | | | | | | | | | | | | Include Deprecation - Init Playbook Paths
| * | | | | Include Deprecation - Init Playbook PathsRussell Teague2017-11-168-14/+14
| | |_|/ / | |/| | |
* | | | | Playbook Consolidation - openshift-nodeRussell Teague2017-11-211-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #6145 from mtnbikenc/consolidate-openshift-etcdScott Dodson2017-11-212-2/+2
|\ \ \ \ | | | | | | | | | | Playbook Consolidation - openshift-etcd
| * | | | Playbook Consolidation - openshift-etcdRussell Teague2017-11-162-2/+2
| |/ / /
* | | | Merge pull request #6175 from zgalor/tunable_prometheusScott Dodson2017-11-213-2/+13
|\ \ \ \ | | | | | | | | | | Allow modifying and adding prometheus application arguments
| * | | | Allow modifying and adding prometheus application argumentsZohar Galor2017-11-193-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-nfsScott Dodson2017-11-212-2/+2
|\ \ \ \ | | | | | | | | | | Playbook Consolidation - openshift-nfs
| * | | | Playbook Consolidation - openshift-nfsRussell Teague2017-11-162-2/+2
| | |/ / | |/| |
* | | | Merge pull request #6186 from jarrpa/glusterfs-files-3.8Scott Dodson2017-11-2113-0/+883
|\ \ \ \ | | | | | | | | | | GlusterFS: Files and templates for 3.8
| * | | | GlusterFS: Files and templates for 3.8Jose A. Rivera2017-11-2013-0/+883
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | Merge pull request #6197 from mgugino-upstream-stage/etcd-imageScott Dodson2017-11-216-12/+10
|\ \ \ \ | |_|_|/ |/| | | Refactor etcd image
| * | | Refactor etcd imageMichael Gugino2017-11-206-12/+10
| |/ / | | | | | | | | | Simplify logic for etcd_image
* / / Only remove empty keys from env if env existsScott Dodson2017-11-201-1/+2
|/ /
* | Merge pull request #5652 from ruromero/bz1498398OpenShift Merge Robot2017-11-182-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 tagRuben Romero Montes2017-10-042-0/+4
| | |
* | | Merge pull request #6147 from mtnbikenc/consolidate-openshift-checksOpenShift Merge Robot2017-11-172-25/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Playbook Consolidation - openshift-checks - Create playbooks/openshift-checks directory - Move everything from playbooks/byo/openshift-checks to playbooks/openshift-checks - Move everything from playbooks/common/openshift-checks to playbooks/openshift-checks/private - Fix all include path references throughout playbooks/ Trello: https://trello.com/c/2Rx1uvjz/547-2-playbook-consolidation-openshift-checks
| * | | Playbook Consolidation - openshift-checksRussell Teague2017-11-162-25/+25
| | |/ | |/|
* | | Merge pull request #6150 from jarrpa/glusterfs-block-fixLuke Meyer2017-11-178-12/+28
|\ \ \ | | | | | | | | GlusterFS: Add configuration for auto creating block-hosting volumes
| * | | GlusterFS: Add configuration for auto creating block-hosting volumesJose A. Rivera2017-11-168-12/+28
| | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | Merge pull request #6167 from kwoodson/mtu_int_valueOpenShift Merge Robot2017-11-172-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Updating mtu value to int
| * | | | Updating mtu value to intKenny Woodson2017-11-172-2/+2
| | | | |
* | | | | Merge pull request #6153 from jcantrill/es_prom_service_selector_errorOpenShift Merge Robot2017-11-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. fix the logging-es-prometheus selector This PR fixes the the service selector for the prometheus service
| * | | | | fix the logging-es-prometheus selectorJeff Cantrill2017-11-161-1/+1
| |/ / / /
* | | | | Merge pull request #6082 from mgugino-upstream-stage/combine-node-upgradeOpenShift Merge Robot2017-11-1626-470/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Combine openshift_node and openshift_node_upgrade Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places.
| * | | | | Combine openshift_node and openshift_node_upgradeMichael Gugino2017-11-1626-470/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, having openshift_node and openshift_node_upgrade as two distinct roles has created a duplication across handlers, templates, and some tasks. This commit combines the roles to reduce duplication and bugs encountered by not putting code in both places.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 15:25:48 +0000