summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3142 from bparees/forcepull_quotesScott Dodson2017-01-243-11/+2
|\ | | | | treat force_pull as a bool
| * treat force_pull as a boolBen Parees2017-01-233-11/+2
| | | | | | | | bug https://bugzilla.redhat.com/show_bug.cgi?id=1414756
* | Merge pull request #3166 from abutcher/pylintRussell Teague2017-01-241-6/+23
|\ \ | | | | | | [openshift_facts] pylint cleanse
| * | Clean up pylint for delete_empty_keys.Andrew Butcher2017-01-241-6/+23
| | |
* | | Merge pull request #3165 from abutcher/fix-default-iptables-argsScott Dodson2017-01-241-2/+2
|\ \ \ | |/ / |/| | [os_firewall] Fix default iptables args.
| * | [os_firewall] Fix default iptables args.Andrew Butcher2017-01-241-2/+2
|/ /
* | Merge pull request #3125 from ashcrow/serial-master-upgrade-docJason DeTiberus2017-01-242-0/+76
|\ \ | | | | | | HOOKS.md added documenting new hooks
| * | Added link to HOOKS in READMESteve Milner2017-01-231-0/+6
| | |
| * | HOOKS.md added documenting new hooksSteve Milner2017-01-231-0/+70
| | |
* | | Merge pull request #3044 from mtnbikenc/docker-optionsJason DeTiberus2017-01-243-1/+6
|\ \ \ | | | | | | | | Add new option 'docker_selinux_enabled'
| * | | Add new option 'openshift_docker_selinux_enabled'Russell Teague2017-01-243-1/+6
| | | | | | | | | | | | | | | | | | | | Allows controlling 'selinux-enabled' docker options Can be set to true or false
* | | | Merge pull request #3158 from bparees/skip_proxiesJason DeTiberus2017-01-241-0/+12
|\ \ \ \ | | | | | | | | | | do not set empty proxy env variable defaults
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Bz 1414477 missing import jks deuce
| * | | | | fix BZ1414477. Use keytool on control node and require javaJeff Cantrill2017-01-233-137/+49
| | | | | |
* | | | | | Merge pull request #3101 from dgoodwin/pre-post-master-hookJason DeTiberus2017-01-243-0/+62
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Implement simple hooks pre/post master upgrade.
| * | | | | Add a mid upgrade hook, re-prefix variables.Devan Goodwin2017-01-233-17/+33
| | | | | |
| * | | | | Debug message before running hooks.Devan Goodwin2017-01-191-0/+6
| | | | | |
| * | | | | Run user provided hooks prior to system/service restarts.Devan Goodwin2017-01-191-3/+4
| | | | | |
| * | | | | Implement pre/post master upgrade hooks.Devan Goodwin2017-01-193-0/+39
| | | | | |
* | | | | | Merge pull request #3161 from tbielawa/maccabe_version_conflictJason DeTiberus2017-01-241-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | TEMPORARY work-around for flake8 vs maccabe version conflict
| * | | | | | Temporary work-around for flake8 vs maccabe version conflictTim Bielawa2017-01-241-0/+2
|/ / / / / /
* | | | | | Merge pull request #3152 from abutcher/iptables-wScott Dodson2017-01-241-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Bug 1415800 - Installer fails to add/check iptables rule due to lock on xtables.
| * | | | | [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.
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updating to use local_action script to generate jks certs for logging
| * \ \ \ \ \ \ 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 install
| * | | | | | | 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 option
| * | | | | | Add containzerized haproxy optionAndrew Lau2017-01-213-4/+40
| | | | | | |
* | | | | | | Merge pull request #3136 from jcantrill/logging_oc_applyJason DeTiberus2017-01-201-7/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix openshift_logging oc_apply to allow running on any control node
| * | | | | | | 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 host
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Apply openshift_node_dnsmasq after os_firewall in node deps
| * | | | | | | Reorder node dnsmasq dependency s.t. networkmanager is restarted after ↵Andrew Butcher2017-01-201-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | firewall changes have been applied.
* | | | | | | Merge pull request #3130 from kwoodson/lib_openshift_versionKenny Woodson2017-01-2015-63/+1789
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding oc_version to lib_openshift.
| * | | | | | | 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_certificates
| * | | | | | | 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 oauth
| * | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Corrects the metrics variable in the README
| * | | | | 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 earlier when upgrading
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 18:25:36 +0000