summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updating openshift_hosted_logging to update master-configs with publicLoggingURLewolinetz2017-01-305-6/+31
* Breaking out master-config changing and updated playbook to apply change to o...ewolinetz2017-01-303-6/+15
* ensuring ruamel.yaml is on target for oc_scaleewolinetz2017-01-271-0/+4
* Updating to correctly pull handler for openshift_logging. Adding logic to ope...ewolinetz2017-01-275-0/+19
* Updating openshift_logging role to add kibana public url to loggingPublicURL ...ewolinetz2017-01-271-0/+7
* Merge pull request #3210 from jcantrill/metrics_adopt_oc_scaleJeff Cantrill2017-01-274-48/+37
|\
| * adopt oc_scale for openshift_metrics roleJeff Cantrill2017-01-274-48/+37
* | Merge pull request #3204 from jcantrill/adopt_oc_scale_moduleJeff Cantrill2017-01-275-68/+79
|\ \ | |/ |/|
| * 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.Kenny Woodson2017-01-274-0/+47
* | Merge pull request #3200 from ewolinetz/logging_fix_node_labellingEric Wolinetz2017-01-273-5/+11
|\ \
| * | Fixing fluentd node labellingewolinetz2017-01-263-5/+11
* | | Merge pull request #3198 from mtnbikenc/drain-fixRussell Teague2017-01-264-20/+4
|\ \ \ | |_|/ |/| |
| * | Correct usage of draining nodesRussell Teague2017-01-264-20/+4
* | | Merge pull request #3183 from kwoodson/oc_scaleKenny Woodson2017-01-2616-53/+2548
|\ \ \ | |_|/ |/| |
| * | 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 #3184 from mtnbikenc/add_host_idempScott Dodson2017-01-2622-26/+74
|\ \ \
| * | | Standardize add_host: with name and changed_whenRussell Teague2017-01-2522-26/+74
* | | | Merge pull request #3191 from mtnbikenc/gitignore-cleanupScott Dodson2017-01-261-7/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | .gitignore cleanupRussell Teague2017-01-261-7/+5
* | | | Merge pull request #2973 from AlbertoPeon/metrics_urlScott Dodson2017-01-263-6/+5
|\ \ \ \
| * | | | 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 so that it appears as a ...Andrew Butcher2017-01-256-6/+6
| | |/ / | |/| |
* | | | Merge pull request #3181 from sdodson/10seconds-ought-to-be-enoughScott Dodson2017-01-252-0/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add 10 second wait after disabling firewalldScott Dodson2017-01-252-0/+10
* | | | Merge pull request #3156 from abutcher/ansible-unsafe-textScott Dodson2017-01-251-1/+5
|\ \ \ \
| * | | | Make use of AnsibleDumper in openshift_master filters s.t. we can represent A...Andrew Butcher2017-01-231-1/+5
* | | | | Merge pull request #3159 from twiest/oc_secretThomas Wiest2017-01-258-0/+2281
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | Generate the artifacts from fragments.Tim Bielawa2017-01-245-0/+116
| * | | | Update the generators to include fragment bannersTim Bielawa2017-01-242-2/+72
* | | | | Merge pull request #3178 from abutcher/free-master-countAndrew Butcher2017-01-251-9/+1
|\ \ \ \ \
| * | | | | Remove master_count restriction.Andrew Butcher2017-01-251-9/+1
* | | | | | Merge pull request #3177 from mtnbikenc/pipdep-fixJason DeTiberus2017-01-251-5/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | flake8 mccabe dependency fixRussell Teague2017-01-251-5/+2
* | | | | | Merge pull request #3133 from mwringe/hawkular-metrics-0.23-updateScott Dodson2017-01-251-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Template update for Hawkular Metrics 0.23mwringe2017-01-191-0/+2
| | |_|_|/ | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.5.2-1].Scott Dodson2017-01-252-2/+63
* | | | | Merge pull request #3176 from sdodson/image-stream-syncScott Dodson2017-01-255-94/+134
|\ \ \ \ \
| * | | | | 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 cloudproviderJason DeTiberus2017-01-241-0/+2