Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3177 from mtnbikenc/pipdep-fix | Jason DeTiberus | 2017-01-25 | 1 | -5/+2 |
|\ | | | | | flake8 mccabe dependency fix | ||||
| * | flake8 mccabe dependency fix | Russell Teague | 2017-01-25 | 1 | -5/+2 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.5.2-1]. | Scott Dodson | 2017-01-25 | 2 | -2/+63 |
| | | | |||||
* | | | 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 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3150 from jcantrill/bz_1415447_stop_heaster | Jason DeTiberus | 2017-01-24 | 1 | -5/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Conditionally include metrics start/stop | ||||
| * | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional ↵ | Jeff Cantrill | 2017-01-24 | 1 | -5/+2 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | include | ||||
* | | | | | | Merge pull request #2981 from dgoodwin/upgrade-wait-for-node | Jason DeTiberus | 2017-01-24 | 1 | -0/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Wait for nodes to be ready before proceeding with upgrade. | ||||
| * | | | | | | Wait for nodes to be ready before proceeding with upgrade. | Devan Goodwin | 2016-12-15 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Near the end of node upgrade, we now wait for the node to report Ready before marking it schedulable again. This should help eliminate delays when pods need to relocate as the next node in line is evacuated. Happens near the end of the process, the only remaining task would be to mark it schedulable again so easy for admins to detect and recover from. | ||||
* | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3165 from abutcher/fix-default-iptables-args | Scott Dodson | 2017-01-24 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | [os_firewall] Fix default iptables args. | ||||
| * | | | | | | | [os_firewall] Fix default iptables args. | Andrew Butcher | 2017-01-24 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3125 from ashcrow/serial-master-upgrade-doc | Jason DeTiberus | 2017-01-24 | 2 | -0/+76 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | HOOKS.md added documenting new hooks | ||||
| * | | | | | | | Added link to HOOKS in README | Steve Milner | 2017-01-23 | 1 | -0/+6 |
| | | | | | | | | |||||
| * | | | | | | | HOOKS.md added documenting new hooks | Steve Milner | 2017-01-23 | 1 | -0/+70 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3044 from mtnbikenc/docker-options | Jason DeTiberus | 2017-01-24 | 3 | -1/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add new option 'docker_selinux_enabled' | ||||
| * | | | | | | | | Add new option 'openshift_docker_selinux_enabled' | Russell Teague | 2017-01-24 | 3 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows controlling 'selinux-enabled' docker options Can be set to true or false | ||||
* | | | | | | | | | Merge pull request #3158 from bparees/skip_proxies | Jason DeTiberus | 2017-01-24 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | do not set empty proxy env variable defaults | ||||
| * | | | | | | | | do not set empty proxy env variable defaults | Ben Parees | 2017-01-24 | 1 | -0/+12 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuce | Scott Dodson | 2017-01-24 | 3 | -137/+49 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bz 1414477 missing import jks deuce | ||||
| * | | | | | | | | | fix BZ1414477. Use keytool on control node and require java | Jeff Cantrill | 2017-01-23 | 3 | -137/+49 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #3101 from dgoodwin/pre-post-master-hook | Jason DeTiberus | 2017-01-24 | 3 | -0/+62 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Implement simple hooks pre/post master upgrade. | ||||
| * | | | | | | | | Add a mid upgrade hook, re-prefix variables. | Devan Goodwin | 2017-01-23 | 3 | -17/+33 |
| | | | | | | | | | |||||
| * | | | | | | | | Debug message before running hooks. | Devan Goodwin | 2017-01-19 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Run user provided hooks prior to system/service restarts. | Devan Goodwin | 2017-01-19 | 1 | -3/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement pre/post master upgrade hooks. | Devan Goodwin | 2017-01-19 | 3 | -0/+39 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3161 from tbielawa/maccabe_version_conflict | Jason DeTiberus | 2017-01-24 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | TEMPORARY work-around for flake8 vs maccabe version conflict | ||||
| * | | | | | | | | Temporary work-around for flake8 vs maccabe version conflict | Tim Bielawa | 2017-01-24 | 1 | -0/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3152 from abutcher/iptables-w | Scott Dodson | 2017-01-24 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Bug 1415800 - Installer fails to add/check iptables rule due to lock on xtables. | ||||
| * | | | | | | | [os_firewall] Add -w flag to wait for iptables xtables lock. | Andrew Butcher | 2017-01-23 | 1 | -1/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3155 from abutcher/bz1368579 | Scott Dodson | 2017-01-23 | 1 | -21/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove unused temporary directory in master config playbook. | ||||
| * | | | | | | | | Remove unused temporary directory in master config playbook. | Andrew Butcher | 2017-01-23 | 1 | -21/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3135 from ewolinetz/fix_logging_jks_gen | Scott Dodson | 2017-01-23 | 6 | -78/+128 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Updating to use local_action script to generate jks certs for logging |