summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 pull request #3155 from abutcher/bz1368579Scott Dodson2017-01-231-21/+0
|\ \
| * | Remove unused temporary directory in master config playbook.Andrew Butcher2017-01-231-21/+0
* | | Merge pull request #3135 from ewolinetz/fix_logging_jks_genScott Dodson2017-01-236-78/+128
|\ \ \
| * \ \ Merge branch 'master' into fix_logging_jks_genEric Wolinetz2017-01-2327-112/+1884
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_toolsScott Dodson2017-01-233-0/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | fixes BZ-1414625. Check for httpd-tools and java before installJeff Cantrill2017-01-233-0/+23
|/ / /
* | | 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
| |/ / / /
* | | | | Merge pull request #3143 from abutcher/reorder-dnsmasq-configJason DeTiberus2017-01-201-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
|\ \ \ \
| * | | | Adding version to lib_openshiftKenny Woodson2017-01-2015-63/+1789
* | | | | Merge pull request #3132 from richm/g_master_mktemp-conflictAndrew Butcher2017-01-201-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | g_master_mktemp in openshift-master conflicts with openshift_master_certificatesRich Megginson2017-01-191-4/+4
* | | | | Merge pull request #3138 from gabemontero/fixJenkins1-3Scott Dodson2017-01-202-28/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | jenkins v1.3 templates should not enable oauthgabemontero2017-01-202-28/+0
|/ / / /
| | | * Adding to ansible spec and changing logging jks generation to be a local_actionewolinetz2017-01-205-36/+115
| | | * Removing docker run strategy and make java a requirement for control hostewolinetz2017-01-203-13/+18
| | | * Updating to use docker run instead of scheduling jks gen podewolinetz2017-01-201-47/+13
| |_|/ |/| |
* | | Merge pull request #3123 from jcantrill/bz_141619Jason DeTiberus2017-01-191-1/+1
|\ \ \
| * | | fixes BZ141619. Corrects the variable in the READMEJeff Cantrill2017-01-191-1/+1
* | | | Merge pull request #3126 from mtnbikenc/fix-upgrade-repocacheJason DeTiberus2017-01-193-8/+17
|\ \ \ \
| * | | | Cleaning repo cache earlierRussell Teague2017-01-193-8/+17
| | |/ / | |/| |
* | | | Merge pull request #3117 from kwoodson/lib_openshiftKenny Woodson2017-01-198-27/+1787
|\ \ \ \ | |/ / / |/| | |
| * | | Adding oc_obj to the lib_openshift libraryKenny Woodson2017-01-188-27/+1787
* | | | Merge pull request #3124 from ashcrow/spec-tarScott Dodson2017-01-191-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Added tar as a requirement per BZ1388445Steve Milner2017-01-191-0/+1
|/ / /
* | | Merge pull request #3120 from ewolinetz/logging_role_fixesJason DeTiberus2017-01-192-3/+3
|\ \ \
| * | | Addressing found issues with logging roleewolinetz2017-01-182-3/+3
| |/ /
* | | Merge pull request #3093 from mtnbikenc/upgrade-fixScott Dodson2017-01-191-0/+2
|\ \ \
| * | | Correct consistency between upgrade playbooksRussell Teague2017-01-131-0/+2
* | | | Merge pull request #3057 from dgoodwin/serial-master-upgradeScott Dodson2017-01-198-33/+45
|\ \ \ \
| * | | | Perform master upgrades in a single play serially.Devan Goodwin2017-01-183-28/+24
| * | | | Validate system restart policy during pre-upgrade.Devan Goodwin2017-01-188-70/+86
| | |_|/ | |/| |
* | | | Merge pull request #3107 from kwoodson/generate_tox_testJason DeTiberus2017-01-185-25/+100
|\ \ \ \ | |_|_|/ |/| | |
| * | | Updated the generate.py scripts for tox and virtualenv.Kenny Woodson2017-01-185-30/+62
| * | | Adding tox tests for generated code.Kenny Woodson2017-01-182-1/+44
* | | | Automatic commit of package [openshift-ansible] release [3.5.1-1].Scott Dodson2017-01-182-2/+120
* | | | Merge pull request #3114 from dgoodwin/wait-for-restartScott Dodson2017-01-181-5/+12
|\ \ \ \
| * | | | More reliable wait for master after full host reboot.Devan Goodwin2017-01-181-5/+12
| |/ / /
* | | | Merge pull request #3112 from derekwaynecarr/cgroup_rwJason DeTiberus2017-01-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | kubelet must have rw to cgroups for pod/qos cgroups to functionDerek Carr2017-01-181-1/+1
* | | | Merge pull request #3100 from abutcher/serialsScott Dodson2017-01-186-39/+58
|\ \ \ \
| * | | | Ensure serial certificate generation for node and master certificates.Andrew Butcher2017-01-172-20/+33