summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3116-315/+260
|\
| * Merge pull request #1962 from abutcher/revert-certJason DeTiberus2016-05-3019-371/+289
| |\
| | * Revert openshift-certificates changes.Andrew Butcher2016-05-3019-371/+289
| |/
* | 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 image tag to rpm version filter.Devan Goodwin2016-05-301-3/+2
* | Fix error with containerized etcd install.Devan Goodwin2016-05-301-6/+6
* | Merge remote-tracking branch 'upstream/master' into upgrade33Devan Goodwin2016-05-3084-2049/+1255
|\|
| * Merge pull request #1896 from abutcher/openshift-loadbalancerJason DeTiberus2016-05-2716-82/+123
| |\
| | * Separate master and haproxy config playbooks.Andrew Butcher2016-05-2616-82/+123
| * | Merge pull request #1947 from abutcher/rm-binJason DeTiberus2016-05-2725-1659/+0
| |\ \
| | * | Cleanup bin, test and roles/openshift_ansible_inventory following move to ope...Andrew Butcher2016-05-2525-1659/+0
| * | | Merge pull request #1672 from jstuever/os_clocksJason DeTiberus2016-05-269-0/+51
| |\ \ \ | | |_|/ | |/| |
| | * | Adding openshift_clock parameters to example inventory filesJeremiah Stuever2016-05-203-0/+8
| | * | 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-263-3/+9
| |\ \ \
| | * | | Automatic commit of package [openshift-ansible] release [3.0.94-1].Scott Dodson2016-05-262-2/+5
| | * | | Use grep to decide when to add our commentScott Dodson2016-05-261-1/+4
| * | | | Merge pull request #1908 from abutcher/openshift-certificatesJason DeTiberus2016-05-2619-289/+371
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Consolidate ca/master/node certificates roles into openshift_certificates.Andrew Butcher2016-05-1919-289/+371
| | | |/ | | |/|
| * | | Merge pull request #1773 from detiber/aws_cleanupJason DeTiberus2016-05-2518-30/+701
| |\ \ \
| | * | | allow for overriding dns_flavor for openstack providerJason DeTiberus2016-05-052-1/+2
| | * | | add user-data file back to openstack provisionerJason DeTiberus2016-05-051-0/+13
| | * | | g_all_hosts with templated with_items causes errors with ansible 1.9.4 under ...Jason DeTiberus2016-05-058-12/+12
| | * | | openstack_fixesJason DeTiberus2016-05-054-20/+39
| | * | | libvirt_fixesJason DeTiberus2016-05-052-3/+33
| | * | | gce fixesJason DeTiberus2016-05-055-6/+583
| | * | | aws provider fixesJason DeTiberus2016-05-055-9/+38
| | * | | Call evaluate_groups from update_repos_and_packagesJason DeTiberus2016-05-051-0/+2
* | | | | Refactor openshift_version behavior.Devan Goodwin2016-05-305-80/+73
* | | | | Protect installed version on subsequent masters.Devan Goodwin2016-05-301-2/+22
* | | | | Get rpm installations functional again.Devan Goodwin2016-05-267-23/+45
* | | | | Convert generic openshift_version=3.2 to specific early in install.Devan Goodwin2016-05-251-0/+12
* | | | | Preserve node versions on re-run.Devan Goodwin2016-05-252-5/+17
* | | | | Fix version compare with using just 3.2 or 1.2.Devan Goodwin2016-05-251-2/+2
* | | | | Hookup node configuration.Devan Goodwin2016-05-256-13/+21
* | | | | Complete installation of first master containerized.Devan Goodwin2016-05-253-4/+4
* | | | | Stop downgrading Docker because we don't know what version to install yet.Devan Goodwin2016-05-252-5/+11
* | | | | Work towards determining openshift_version when unspecified.Devan Goodwin2016-05-2512-13/+28
* | | | | Remove now unnecessary pull and ver check in openshift_docker role.Devan Goodwin2016-05-251-36/+0
* | | | | Set openshift_version in config playbooks for first master.Devan Goodwin2016-05-257-19/+79
* | | | | Debug output.Devan Goodwin2016-05-253-0/+11
|/ / / /
* | | | Merge pull request #1942 from sdodson/bind_mountsAndrew Butcher2016-05-241-1/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Catch more uninstall targetsScott Dodson2016-05-241-1/+12
* | | | Automatic commit of package [openshift-ansible] release [3.0.93-1].Troy Dawson2016-05-242-2/+5
* | | | Fixup spec fileTroy Dawson2016-05-241-36/+0
* | | | Automatic commit of package [openshift-ansible] release [3.0.92-1].Troy Dawson2016-05-242-2/+42