summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-06-0911-36/+145
|\
| * Merge pull request #1996 from abutcher/ansible-2.1Andrew Butcher2016-06-081-1/+9
| |\
| | * Ansible 2.1 support.Andrew Butcher2016-06-071-1/+9
| * | Add openshift_loadbalancer_facts role to set lb facts prior to running depend...Andrew Butcher2016-06-086-34/+79
| * | Preserve proxy config if it's undefinedScott Dodson2016-06-072-0/+44
| * | At least backup thingsScott Dodson2016-06-071-0/+3
| |/
| * 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
* | | Respect image tag/pkg version during upgrade.Devan Goodwin2016-06-071-3/+3
* | | Force version to latest 3.2 during upgrade.Devan Goodwin2016-06-071-0/+4
* | | Do not install rpm for version in openshift_version role.Devan Goodwin2016-06-064-12/+22
* | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-06-0652-172/+3510
|\| |
| * | 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
* | | | Update openshift_version author info.Devan Goodwin2016-06-011-2/+2
* | | | Fix installing release 3.1 not converting to precise version.Devan Goodwin2016-06-013-4/+8
* | | | Break version calc out into a role, separate yaml for containerized/rpm.Devan Goodwin2016-05-316-84/+104
* | | | Drop unnecessary node playbook version calculation.Devan Goodwin2016-05-311-1/+1
* | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3114-301/+103
|\| | |
| * | | Revert openshift-certificates changes.Andrew Butcher2016-05-3017-357/+132
* | | | Add leading v for remaining IMAGE_VERSION templates.Devan Goodwin2016-05-302-2/+2
* | | | Fix error restarting master service that may not be there.Devan Goodwin2016-05-301-2/+7
* | | | Fix use of openshift_version in ca role.Devan Goodwin2016-05-301-4/+1
* | | | Fix error with containerized etcd install.Devan Goodwin2016-05-301-6/+6
* | | | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3033-260/+495
|\| | |
| * | | 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
| | | |/ | | |/|