Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3210 from jcantrill/metrics_adopt_oc_scale | Jeff Cantrill | 2017-01-27 | 4 | -48/+37 |
|\ | | | | | adopt oc_scale for openshift_metrics role | ||||
| * | adopt oc_scale for openshift_metrics role | Jeff Cantrill | 2017-01-27 | 4 | -48/+37 |
| | | |||||
* | | adopt oc_scale module for openshift_logging role | Jeff Cantrill | 2017-01-27 | 5 | -68/+79 |
|/ | |||||
* | Merge pull request #3206 from kwoodson/oc_scale_fix | Kenny Woodson | 2017-01-27 | 4 | -0/+47 |
|\ | | | | | Adding fix for when the resource does not exist. Added test cases. | ||||
| * | Adding fix for when the resource does not exist. Added test cases. | Kenny Woodson | 2017-01-27 | 4 | -0/+47 |
| | | |||||
* | | Merge pull request #3200 from ewolinetz/logging_fix_node_labelling | Eric Wolinetz | 2017-01-27 | 3 | -5/+11 |
|\ \ | | | | | | | Fixing fluentd node labelling | ||||
| * | | Fixing fluentd node labelling | ewolinetz | 2017-01-26 | 3 | -5/+11 |
| | | | |||||
* | | | Merge pull request #3198 from mtnbikenc/drain-fix | Russell Teague | 2017-01-26 | 1 | -15/+0 |
|\ \ \ | |_|/ |/| | | Correct usage of draining nodes | ||||
| * | | Correct usage of draining nodes | Russell Teague | 2017-01-26 | 1 | -15/+0 |
| |/ | |||||
* | | Merge pull request #3183 from kwoodson/oc_scale | Kenny Woodson | 2017-01-26 | 16 | -53/+2548 |
|\ \ | |/ |/| | Adding oc_scale to lib_openshift. | ||||
| * | Fixing namespace param in doc to reflect default value. | Kenny Woodson | 2017-01-26 | 2 | -2/+2 |
| | | |||||
| * | Adding banners. Small bug fix to namespace appending in base. | Kenny Woodson | 2017-01-25 | 3 | -13/+44 |
| | | |||||
| * | Fixing tests and linting. | Kenny Woodson | 2017-01-25 | 8 | -111/+96 |
| | | |||||
| * | Adding unit test for oc_scale | Kenny Woodson | 2017-01-25 | 1 | -0/+155 |
| | | |||||
| * | Adding integration test for oc_scale. | Kenny Woodson | 2017-01-25 | 12 | -23/+794 |
| | | |||||
| * | Adding oc_scale to lib_openshift. | Kenny Woodson | 2017-01-25 | 6 | -0/+1553 |
| | | |||||
* | | Merge pull request #2973 from AlbertoPeon/metrics_url | Scott Dodson | 2017-01-26 | 3 | -6/+5 |
|\ \ | | | | | | | Set metrics url even if metrics_deploy is false | ||||
| * | | Set metrics url even if metrics_deploy is false | Alberto Peon | 2017-01-20 | 3 | -6/+5 |
| | | | |||||
* | | | Merge pull request #3182 from abutcher/no-proxy-list | Scott Dodson | 2017-01-26 | 6 | -6/+6 |
|\ \ \ | | | | | | | | | Comma separate no_proxy host list in openshift_facts | ||||
| * | | | Comma separate no_proxy host list in openshift_facts so that it appears as a ↵ | Andrew Butcher | 2017-01-25 | 6 | -6/+6 |
| | | | | | | | | | | | | | | | | string everywhere it is used. | ||||
* | | | | Merge pull request #3181 from sdodson/10seconds-ought-to-be-enough | Scott Dodson | 2017-01-25 | 2 | -0/+10 |
|\ \ \ \ | |_|_|/ |/| | | | Add 10 second wait after disabling firewalld/iptables | ||||
| * | | | Add 10 second wait after disabling firewalld | Scott Dodson | 2017-01-25 | 2 | -0/+10 |
| | | | | |||||
* | | | | Added oc_secret to lib_openshift. | Thomas Wiest | 2017-01-25 | 8 | -0/+2281 |
| |/ / |/| | | |||||
* | | | Merge pull request #3141 from tbielawa/fragment_banners | Andrew Butcher | 2017-01-25 | 7 | -2/+188 |
|\ \ \ | | | | | | | | | Fragment banners | ||||
| * | | | Generate the artifacts from fragments. | Tim Bielawa | 2017-01-24 | 5 | -0/+116 |
| | | | | |||||
| * | | | Update the generators to include fragment banners | Tim Bielawa | 2017-01-24 | 2 | -2/+72 |
| | | | | |||||
* | | | | Remove master_count restriction. | Andrew Butcher | 2017-01-25 | 1 | -9/+1 |
| | | | | |||||
* | | | | Merge pull request #3133 from mwringe/hawkular-metrics-0.23-update | Scott Dodson | 2017-01-25 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | Template update for Hawkular Metrics 0.23 | ||||
| * | | | Template update for Hawkular Metrics 0.23 | mwringe | 2017-01-19 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #3176 from sdodson/image-stream-sync | Scott Dodson | 2017-01-25 | 5 | -94/+134 |
|\ \ \ | | | | | | | | | Sync latest image streams | ||||
| * | | | Sync latest image streams | Scott Dodson | 2017-01-25 | 5 | -94/+134 |
| | | | | |||||
* | | | | Merge pull request #3172 from detiber/gceNodeName | Scott Dodson | 2017-01-25 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | override nodename for gce with cloudprovider | ||||
| * | | | | override nodename for gce with cloudprovider | Jason DeTiberus | 2017-01-24 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3169 from jcantrill/logging_node_selector | Scott Dodson | 2017-01-25 | 7 | -0/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | allow openshift_logging role to specify nodeSelectors | ||||
| * | | | | | allow openshift_logging role to specify nodeSelectors | Jeff Cantrill | 2017-01-24 | 7 | -0/+27 |
| |/ / / / | |||||
* | | | | | Merge pull request #3173 from lhuard1A/ose_3.4 | Scott Dodson | 2017-01-25 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow RHEL subscription for OSE 3.4 | ||||
| * | | | | | Allow RHEL subscription for OSE 3.4 | Lénaïc Huard | 2017-01-25 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3147 from andrewklau/haproxy-container | Scott Dodson | 2017-01-25 | 3 | -4/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix containerized haproxy config | ||||
| * | | | | | Fix containerized haproxy config | Andrew Lau | 2017-01-25 | 3 | -4/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #3171 from ewolinetz/logging_local_file_creation | Jason DeTiberus | 2017-01-24 | 3 | -68/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fixes jks generation, node labeling, and rerunning for oauth secrets | ||||
| * | | | | | | fixes jks generation, node labeling, and rerunning for oauth secrets | ewolinetz | 2017-01-24 | 3 | -68/+34 |
| | | | | | | | |||||
* | | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional ↵ | Jeff Cantrill | 2017-01-24 | 1 | -5/+2 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | include | ||||
* | | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fix | Jason DeTiberus | 2017-01-24 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove is_containerized check for firewalld installs | ||||
| * | | | | | | Remove is_containerized check for firewalld installs | Russell Teague | 2017-01-24 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3142 from bparees/forcepull_quotes | Scott Dodson | 2017-01-24 | 3 | -11/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | treat force_pull as a bool | ||||
| * | | | | | | treat force_pull as a bool | Ben Parees | 2017-01-23 | 3 | -11/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | bug https://bugzilla.redhat.com/show_bug.cgi?id=1414756 | ||||
* | | | | | | Merge pull request #3166 from abutcher/pylint | Russell Teague | 2017-01-24 | 1 | -6/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [openshift_facts] pylint cleanse | ||||
| * | | | | | | Clean up pylint for delete_empty_keys. | Andrew Butcher | 2017-01-24 | 1 | -6/+23 |
| | | | | | | | |||||
* | | | | | | | [os_firewall] Fix default iptables args. | Andrew Butcher | 2017-01-24 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3044 from mtnbikenc/docker-options | Jason DeTiberus | 2017-01-24 | 2 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add new option 'docker_selinux_enabled' |