summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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 secrets
| * | | | | 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 ↵Jeff Cantrill2017-01-241-5/+2
| |_|_|/ / |/| | | | | | | | | | | | | | include
* | | | | Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus2017-01-241-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove is_containerized check for firewalld installs
| * | | | | 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 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
| | | | | | |
* | | | | | | [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 'docker_selinux_enabled'
| * | | | | | Add new option 'openshift_docker_selinux_enabled'Russell Teague2017-01-242-1/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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 #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 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 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
| | |/ / / /
| * | | / / 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
| | | |_|/ | | |/| |
| * / | | 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-204-36/+114
| | | |
* | | | 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 #3117 from kwoodson/lib_openshiftKenny Woodson2017-01-198-27/+1787
|\ \ \ | |/ / |/| | Adding modules to lib_openshift.
| * | Adding oc_obj to the lib_openshift libraryKenny Woodson2017-01-188-27/+1787
| | |
* | | Merge pull request #3120 from ewolinetz/logging_role_fixesJason DeTiberus2017-01-192-3/+3
|\ \ \ | | | | | | | | Addressing found issues with logging role