summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansibleBrenton Leanhardt2016-06-077-60/+49
|\
| * Fix Docker 1.10 problems with empty tags and trailing :Devan Goodwin2016-06-064-7/+11
| * Docker 1.10 UpgradeDevan Goodwin2016-06-034-53/+38
* | Merge pull request #1973 from ibotty/preserve_htpasswdScott Dodson2016-06-062-1/+10
|\ \
| * | ensure htpasswd file existsTobias Florek2016-06-061-1/+9
| * | Add flag to manage htpasswd, or not.Tobias Florek2016-06-022-1/+2
* | | Update main.yamlJason DeTiberus2016-06-031-1/+1
| |/ |/|
* | Merge pull request #1976 from abutcher/default-log-driverJason DeTiberus2016-06-031-1/+3
|\ \
| * | Configure default docker logging options.Andrew Butcher2016-06-021-1/+3
| |/
* | XPAAS v1.3.1 content for Origin 1.1 / OSE 3.1Scott Dodson2016-06-0218-70/+1721
* | XPAAS v1.3.1 release for Origin 1.2 / OSE 3.2Scott Dodson2016-06-0219-71/+1722
* | Merge pull request #1971 from dgoodwin/missing-services-fixJason DeTiberus2016-06-022-8/+13
|\ \ | |/ |/|
| * Fix error with stopping services that may not exist.Devan Goodwin2016-06-022-8/+13
* | Merge pull request #1968 from abutcher/os-firewall-evalJason DeTiberus2016-06-0110-39/+35
|\ \
| * | Add haproxy_frontend_port to vars for openshift-loadbalancer.Andrew Butcher2016-06-012-8/+7
| * | Move os_firewall_allow from defaults to role dependencies.Andrew Butcher2016-06-018-31/+28
| |/
* | Merge pull request #1957 from jfcoz/metrics_wait_deployerJason DeTiberus2016-06-011-0/+8
|\ \ | |/ |/|
| * wait metrics-deployer complete (need to configure nodes before hosted services)jfcoz2016-05-271-0/+8
* | Merge pull request #1685 from detiber/centos_sigJason DeTiberus2016-05-313-4/+20
|\ \
| * | switch to using sig release packagesJason DeTiberus2016-05-263-9/+20
| * | temporarily disable gpg checking until we have a way to cleanly enable itJason DeTiberus2016-05-261-1/+1
| * | Switch to using CentOS SIG repos for Origin installsJason DeTiberus2016-05-262-0/+5
* | | Revert openshift-certificates changes.Andrew Butcher2016-05-3017-357/+132
* | | Merge pull request #1896 from abutcher/openshift-loadbalancerJason DeTiberus2016-05-278-52/+91
|\ \ \
| * | | Separate master and haproxy config playbooks.Andrew Butcher2016-05-268-52/+91
* | | | Merge pull request #1947 from abutcher/rm-binJason DeTiberus2016-05-276-104/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Cleanup bin, test and roles/openshift_ansible_inventory following move to ope...Andrew Butcher2016-05-256-104/+0
* | | | Merge pull request #1672 from jstuever/os_clocksJason DeTiberus2016-05-266-0/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable openshift_clock role for openshift_master, openshift_node, and openshi...Jeremiah Stuever2016-05-203-0/+3
| * | | Add openshift_clock role to manage system clocksJeremiah Stuever2016-05-202-0/+29
| * | | Allow clock role in openshift_factsJeremiah Stuever2016-05-201-0/+11
| | |/ | |/|
* | | Merge pull request #1952 from sdodson/fix-resolv-confScott Dodson2016-05-261-1/+4
|\ \ \
| * | | Use grep to decide when to add our commentScott Dodson2016-05-261-1/+4
| | |/ | |/|
* | | Merge pull request #1908 from abutcher/openshift-certificatesJason DeTiberus2016-05-2617-132/+357
|\ \ \ | |/ / |/| |
| * | Consolidate ca/master/node certificates roles into openshift_certificates.Andrew Butcher2016-05-1917-132/+357
| |/
* | Conditionally bind mount /usr/bin/docker-current when it is present (#1941)Scott Dodson2016-05-244-6/+27
* | Merge pull request #1932 from jnordell/99-origin-dnsJason DeTiberus2016-05-231-2/+1
|\ \
| * | Removed the echo line and replaced it with inline comment. To keep 99-origin-...Jonas Nordell2016-05-231-2/+1
* | | Extend multiple login provider check to include origin.Andrew Butcher2016-05-231-1/+1
* | | Allow multiple login providers post 3.2.Andrew Butcher2016-05-231-1/+1
|/ /
* | Make rhel_subscribe role able to subscribe for OSE 3.2Lénaïc Huard2016-05-231-1/+1
* | Merge pull request #1923 from abutcher/BZ1337438Jason DeTiberus2016-05-201-3/+1
|\ \
| * | Remove newline from docker_options template string.Andrew Butcher2016-05-191-3/+1
| |/
* / Ensure yum-utils installed.Andrew Butcher2016-05-191-0/+4
|/
* Merge pull request #1913 from maci0/patch-1Jason DeTiberus2016-05-181-1/+1
|\
| * docker-current was missing from the containerized atomic-openshift-node.servi...Marcel Wysocki2016-05-181-1/+1
* | Merge pull request #1911 from jdnieto/fix_hawkular_variable_templatesJason DeTiberus2016-05-181-3/+2
|\ \
| * | fixed issue with blank spaces instead commas as variables template separatorsJose David Martin Nieto2016-05-181-3/+2
| |/
* | Merge pull request #1917 from vishpat/haJason DeTiberus2016-05-182-1/+3
|\ \
| * | Use cluster hostname while generating certificate on the master nodesVishal Patil2016-05-182-1/+3
| |/