summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge pull request #3204 from jcantrill/adopt_oc_scale_moduleJeff Cantrill2017-01-275-68/+79
|\ \ | |/ |/| Adopt oc scale module for openshift_logging role
| * 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-264-20/+4
|\ \ \ | |_|/ |/| | Correct usage of draining nodes
| * | Correct usage of draining nodesRussell Teague2017-01-264-20/+4
| | |
* | | 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 #3184 from mtnbikenc/add_host_idempScott Dodson2017-01-2622-26/+74
|\ \ \ | | | | | | | | Standardize add_host: with name and changed_when
| * | | Standardize add_host: with name and changed_whenRussell Teague2017-01-2522-26/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The add_host: task does not change any data on the host and as practice has been configured to changed_when: False. This commit standardizes that usage in the byo and common playbooks. Additionally, taks names are added to each task to improve troubleshooting.
* | | | Merge pull request #3191 from mtnbikenc/gitignore-cleanupScott Dodson2017-01-261-7/+5
|\ \ \ \ | |_|_|/ |/| | | .gitignore cleanup
| * | | .gitignore cleanupRussell Teague2017-01-261-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Escaping hash for emacs temp files so it is not a comment line - *.iml is covered by .idea/ - multi_inventory.yaml is unused - Only ignore the root ansible.cfg, we have another ansible.cfg `git ls-files -i --exclude-standard` - .tox and cover are directories
* | | | 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
| | | |
* | | | Merge pull request #3156 from abutcher/ansible-unsafe-textScott Dodson2017-01-251-1/+5
|\ \ \ \ | | | | | | | | | | Fix yaml representer error seen with ansible-2.2.1.0
| * | | | Make use of AnsibleDumper in openshift_master filters s.t. we can represent ↵Andrew Butcher2017-01-231-1/+5
| | | | | | | | | | | | | | | | | | | | AnsibleUnsafeText when dumping yaml.
* | | | | Merge pull request #3159 from twiest/oc_secretThomas Wiest2017-01-258-0/+2281
|\ \ \ \ \ | |_|_|/ / |/| | | | Added oc_secret to lib_openshift.
| * | | | 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
| | | | |
* | | | | Merge pull request #3178 from abutcher/free-master-countAndrew Butcher2017-01-251-9/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove master_count restriction.
| * | | | | 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 fix
| * | | | | 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.23
| * | | | | 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 22:10:11 +0000