summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* | 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.23mwringe2017-01-191-0/+2
* | | 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
* | | | | Merge pull request #3169 from jcantrill/logging_node_selectorScott Dodson2017-01-257-0/+27
|\ \ \ \ \
| * | | | | 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.4Lénaïc Huard2017-01-251-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3147 from andrewklau/haproxy-containerScott Dodson2017-01-253-4/+8
|\ \ \ \ \
| * | | | | 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 secretsewolinetz2017-01-243-68/+34
* | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional inc...Jeff Cantrill2017-01-241-5/+2
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus2017-01-241-2/+3
|\ \ \ \ \ \
| * | | | | | 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 boolBen Parees2017-01-233-11/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3166 from abutcher/pylintRussell Teague2017-01-241-6/+23
|\ \ \ \ \ \
| * | | | | | Clean up pylint for delete_empty_keys.Andrew Butcher2017-01-241-6/+23
* | | | | | | [os_firewall] Fix default iptables args.Andrew Butcher2017-01-241-2/+2
|/ / / / / /
* | | | | | Merge pull request #3044 from mtnbikenc/docker-optionsJason DeTiberus2017-01-242-1/+3
|\ \ \ \ \ \
| * | | | | | Add new option 'openshift_docker_selinux_enabled'Russell Teague2017-01-242-1/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3158 from bparees/skip_proxiesJason DeTiberus2017-01-241-0/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | do not set empty proxy env variable defaultsBen Parees2017-01-241-0/+12
* | | | | | Merge pull request #3145 from jcantrill/bz_1414477_missing_import_jks_deuceScott Dodson2017-01-243-137/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix BZ1414477. Use keytool on control node and require javaJeff Cantrill2017-01-233-137/+49
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3152 from abutcher/iptables-wScott Dodson2017-01-241-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [os_firewall] Add -w flag to wait for iptables xtables lock.Andrew Butcher2017-01-231-1/+3
* | | | | Merge branch 'master' into fix_logging_jks_genEric Wolinetz2017-01-2326-112/+1883
|\ \ \ \ \
| * | | | | fixes BZ-1414625. Check for httpd-tools and java before installJeff Cantrill2017-01-232-0/+22
| * | | | | Merge pull request #3106 from andrewklau/haproxy-containerScott Dodson2017-01-223-4/+40
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Add containzerized haproxy optionAndrew Lau2017-01-213-4/+40
| * | | | Merge pull request #3136 from jcantrill/logging_oc_applyJason DeTiberus2017-01-201-7/+14
| |\ \ \ \
| | * | | | fix oc_apply to allow running on any control nodeJeff Cantrill2017-01-191-7/+14
| * | | | | Merge pull request #3128 from jcantrill/3127_oc_apply_for_metricsJason DeTiberus2017-01-201-4/+12
| |\ \ \ \ \
| | * | | | | fixes #3127. Get files for oc_apply from remote hostJeff Cantrill2017-01-191-4/+12
| | |/ / / /
| * | | / / Reorder node dnsmasq dependency s.t. networkmanager is restarted after firewa...Andrew Butcher2017-01-201-2/+2
| | |_|/ / | |/| | |
| * | | | Merge pull request #3130 from kwoodson/lib_openshift_versionKenny Woodson2017-01-2015-63/+1789
| |\ \ \ \