summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3202 from ewolinetz/logging_fix_generating_es_dcScott Dodson2017-01-272-19/+35
|\ | | | | Updating to reuse previous ES DC names and always generate DCs
| * Only manual scale down being allowed nowewolinetz2017-01-272-4/+8
| |
| * Updating to reuse previous ES DC names and always generate DCsewolinetz2017-01-261-17/+29
| |
* | Merge pull request #3195 from jcantrill/bz_1414625_httpd_on_controlScott Dodson2017-01-273-20/+39
|\ \ | | | | | | fix 1414625. Additional fix to run password commands on control node
| * | fix 1414625. Additional fix to run password commands on control nodeJeff Cantrill2017-01-273-20/+39
| | |
* | | Merge pull request #3210 from jcantrill/metrics_adopt_oc_scaleJeff Cantrill2017-01-274-48/+37
|\ \ \ | | | | | | | | adopt oc_scale for openshift_metrics role
| * | | adopt oc_scale for openshift_metrics roleJeff Cantrill2017-01-274-48/+37
| |/ /
* / / adopt oc_scale module for openshift_logging roleJeff Cantrill2017-01-275-68/+79
|/ /
* | Merge pull request #3206 from kwoodson/oc_scale_fixKenny Woodson2017-01-274-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 Woodson2017-01-274-0/+47
| | |
* | | Merge pull request #3200 from ewolinetz/logging_fix_node_labellingEric Wolinetz2017-01-273-5/+11
|\ \ \ | | | | | | | | Fixing fluentd node labelling
| * | | Fixing fluentd node labellingewolinetz2017-01-263-5/+11
| | |/ | |/|
* | | Merge pull request #3198 from mtnbikenc/drain-fixRussell Teague2017-01-261-15/+0
|\ \ \ | |_|/ |/| | Correct usage of draining nodes
| * | Correct usage of draining nodesRussell Teague2017-01-261-15/+0
| |/
* | Merge pull request #3183 from kwoodson/oc_scaleKenny Woodson2017-01-2616-53/+2548
|\ \ | |/ |/| Adding oc_scale to lib_openshift.
| * Fixing namespace param in doc to reflect default value.Kenny Woodson2017-01-262-2/+2
| |
| * Adding banners. Small bug fix to namespace appending in base.Kenny Woodson2017-01-253-13/+44
| |
| * Fixing tests and linting.Kenny Woodson2017-01-258-111/+96
| |
| * Adding unit test for oc_scaleKenny Woodson2017-01-251-0/+155
| |
| * Adding integration test for oc_scale.Kenny Woodson2017-01-2512-23/+794
| |
| * Adding oc_scale to lib_openshift.Kenny Woodson2017-01-256-0/+1553
| |
* | Merge pull request #2973 from AlbertoPeon/metrics_urlScott Dodson2017-01-263-6/+5
|\ \ | | | | | | Set metrics url even if metrics_deploy is false
| * | Set metrics url even if metrics_deploy is falseAlberto Peon2017-01-203-6/+5
| | |
* | | Merge pull request #3182 from abutcher/no-proxy-listScott Dodson2017-01-266-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 Butcher2017-01-256-6/+6
| | | | | | | | | | | | | | | | string everywhere it is used.
* | | | Merge pull request #3181 from sdodson/10seconds-ought-to-be-enoughScott Dodson2017-01-252-0/+10
|\ \ \ \ | |_|_|/ |/| | | Add 10 second wait after disabling firewalld/iptables
| * | | Add 10 second wait after disabling firewalldScott Dodson2017-01-252-0/+10
| | | |
* | | | Added oc_secret to lib_openshift.Thomas Wiest2017-01-258-0/+2281
| |/ / |/| |
* | | Merge pull request #3141 from tbielawa/fragment_bannersAndrew Butcher2017-01-257-2/+188
|\ \ \ | | | | | | | | Fragment banners
| * | | Generate the artifacts from fragments.Tim Bielawa2017-01-245-0/+116
| | | |
| * | | Update the generators to include fragment bannersTim Bielawa2017-01-242-2/+72
| | | |
* | | | Remove master_count restriction.Andrew Butcher2017-01-251-9/+1
| | | |
* | | | Merge pull request #3133 from mwringe/hawkular-metrics-0.23-updateScott Dodson2017-01-251-0/+2
|\ \ \ \ | |_|/ / |/| | | Template update for Hawkular Metrics 0.23
| * | | Template update for Hawkular Metrics 0.23mwringe2017-01-191-0/+2
| | |/ | |/|
* | | Merge pull request #3176 from sdodson/image-stream-syncScott Dodson2017-01-255-94/+134
|\ \ \ | | | | | | | | Sync latest image streams
| * | | Sync latest image streamsScott Dodson2017-01-255-94/+134
| | | |
* | | | Merge pull request #3172 from detiber/gceNodeNameScott Dodson2017-01-251-0/+2
|\ \ \ \ | | | | | | | | | | override nodename for gce with cloudprovider
| * | | | override nodename for gce with cloudproviderJason DeTiberus2017-01-241-0/+2
| | | | |
* | | | | Merge pull request #3169 from jcantrill/logging_node_selectorScott Dodson2017-01-257-0/+27
|\ \ \ \ \ | | | | | | | | | | | | allow openshift_logging role to specify nodeSelectors
| * | | | | allow openshift_logging role to specify nodeSelectorsJeff Cantrill2017-01-247-0/+27
| |/ / / /
* | | | | Merge pull request #3173 from lhuard1A/ose_3.4Scott Dodson2017-01-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow RHEL subscription for OSE 3.4
| * | | | | Allow RHEL subscription for OSE 3.4Lénaïc Huard2017-01-251-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3147 from andrewklau/haproxy-containerScott Dodson2017-01-253-4/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix containerized haproxy config
| * | | | | Fix containerized haproxy configAndrew Lau2017-01-253-4/+8
| | | | | |
* | | | | | Merge pull request #3171 from ewolinetz/logging_local_file_creationJason DeTiberus2017-01-243-68/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixes jks generation, node labeling, and rerunning for oauth secrets
| * | | | | | fixes jks generation, node labeling, and rerunning for oauth secretsewolinetz2017-01-243-68/+34
| | | | | | |
* | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional ↵Jeff Cantrill2017-01-241-5/+2
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | include
* | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus2017-01-241-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove is_containerized check for firewalld installs
| * | | | | | Remove is_containerized check for firewalld installsRussell Teague2017-01-241-2/+3
| | | | | | |
* | | | | | | Merge pull request #3142 from bparees/forcepull_quotesScott Dodson2017-01-243-11/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | treat force_pull as a bool