Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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' | ||||
| * | | | | | | Add new option 'openshift_docker_selinux_enabled' | Russell Teague | 2017-01-24 | 2 | -1/+3 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 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 #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 branch 'master' into fix_logging_jks_gen | Eric Wolinetz | 2017-01-23 | 26 | -112/+1883 |
|\ \ \ \ \ | |||||
| * | | | | | fixes BZ-1414625. Check for httpd-tools and java before install | Jeff Cantrill | 2017-01-23 | 2 | -0/+22 |
| | | | | | | |||||
| * | | | | | Merge pull request #3106 from andrewklau/haproxy-container | Scott Dodson | 2017-01-22 | 3 | -4/+40 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | Add containzerized haproxy option | ||||
| | * | | | Add containzerized haproxy option | Andrew Lau | 2017-01-21 | 3 | -4/+40 |
| | | | | | |||||
| * | | | | Merge pull request #3136 from jcantrill/logging_oc_apply | Jason DeTiberus | 2017-01-20 | 1 | -7/+14 |
| |\ \ \ \ | | | | | | | | | | | | | fix openshift_logging oc_apply to allow running on any control node | ||||
| | * | | | | fix oc_apply to allow running on any control node | Jeff Cantrill | 2017-01-19 | 1 | -7/+14 |
| | | | | | | |||||
| * | | | | | Merge pull request #3128 from jcantrill/3127_oc_apply_for_metrics | Jason DeTiberus | 2017-01-20 | 1 | -4/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | fixes #3127. Get files for oc_apply from remote host | ||||
| | * | | | | | fixes #3127. Get files for oc_apply from remote host | Jeff Cantrill | 2017-01-19 | 1 | -4/+12 |
| | |/ / / / | |||||
| * | | / / | Reorder node dnsmasq dependency s.t. networkmanager is restarted after ↵ | Andrew Butcher | 2017-01-20 | 1 | -2/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | firewall changes have been applied. | ||||
| * | | | | Merge pull request #3130 from kwoodson/lib_openshift_version | Kenny Woodson | 2017-01-20 | 15 | -63/+1789 |
| |\ \ \ \ | | | | | | | | | | | | | Adding oc_version to lib_openshift. | ||||
| | * | | | | Adding version to lib_openshift | Kenny Woodson | 2017-01-20 | 15 | -63/+1789 |
| | | | | | | |||||
| * | | | | | Merge pull request #3132 from richm/g_master_mktemp-conflict | Andrew Butcher | 2017-01-20 | 1 | -4/+4 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | g_master_mktemp in openshift-master conflicts with openshift_master_certificates | ||||
| | * | | | | g_master_mktemp in openshift-master conflicts with openshift_master_certificates | Rich Megginson | 2017-01-19 | 1 | -4/+4 |
| | | |_|/ | | |/| | | |||||
| * / | | | jenkins v1.3 templates should not enable oauth | gabemontero | 2017-01-20 | 2 | -28/+0 |
| |/ / / | |||||
* | | | | Adding to ansible spec and changing logging jks generation to be a local_action | ewolinetz | 2017-01-20 | 4 | -36/+114 |
| | | | | |||||
* | | | | Removing docker run strategy and make java a requirement for control host | ewolinetz | 2017-01-20 | 3 | -13/+18 |
| | | | |