Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #3156 from abutcher/ansible-unsafe-text | Scott Dodson | 2017-01-25 | 1 | -1/+5 | |
|\ \ \ \ | ||||||
| * | | | | Make use of AnsibleDumper in openshift_master filters s.t. we can represent A... | Andrew Butcher | 2017-01-23 | 1 | -1/+5 | |
* | | | | | Merge pull request #3159 from twiest/oc_secret | Thomas Wiest | 2017-01-25 | 8 | -0/+2281 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
* | | | | | Merge pull request #3178 from abutcher/free-master-count | Andrew Butcher | 2017-01-25 | 1 | -9/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove master_count restriction. | Andrew Butcher | 2017-01-25 | 1 | -9/+1 | |
* | | | | | | Merge pull request #3177 from mtnbikenc/pipdep-fix | Jason DeTiberus | 2017-01-25 | 1 | -5/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional inc... | Jeff Cantrill | 2017-01-24 | 1 | -5/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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. | Devan Goodwin | 2016-12-15 | 1 | -0/+13 | |
* | | | | | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fix | Jason DeTiberus | 2017-01-24 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | Ben Parees | 2017-01-23 | 3 | -11/+2 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3166 from abutcher/pylint | Russell Teague | 2017-01-24 | 1 | -6/+23 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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. | 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 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 'openshift_docker_selinux_enabled' | Russell Teague | 2017-01-24 | 3 | -1/+6 | |
* | | | | | | | | | | | Merge pull request #3158 from bparees/skip_proxies | Jason DeTiberus | 2017-01-24 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | 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 |