summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1962 from abutcher/revert-certJason DeTiberus2016-05-3019-371/+289
|\ | | | | Revert openshift-certificates changes.
| * Revert openshift-certificates changes.Andrew Butcher2016-05-3019-371/+289
|/
* Merge pull request #1896 from abutcher/openshift-loadbalancerJason DeTiberus2016-05-2716-82/+123
|\ | | | | Separate master and haproxy config playbooks.
| * Separate master and haproxy config playbooks.Andrew Butcher2016-05-2616-82/+123
| | | | | | | | | | | | * Move haproxy configuration to a separate openshift-loadbalancer play. * Move the haproxy role to openshift_loadbalancer. * Add openshift_loadbalancer* facts which drive haproxy configuration.
* | Merge pull request #1947 from abutcher/rm-binJason DeTiberus2016-05-2725-1659/+0
|\ \ | | | | | | Cleanup following move to openshift-tools
| * | Cleanup bin, test and roles/openshift_ansible_inventory following move to ↵Andrew Butcher2016-05-2525-1659/+0
| | | | | | | | | | | | openshift-tools
* | | Merge pull request #1672 from jstuever/os_clocksJason DeTiberus2016-05-269-0/+51
|\ \ \ | |_|/ |/| | Add openshift_clock role
| * | Adding openshift_clock parameters to example inventory filesJeremiah Stuever2016-05-203-0/+8
| | |
| * | Enable openshift_clock role for openshift_master, openshift_node, and ↵Jeremiah Stuever2016-05-203-0/+3
| | | | | | | | | | | | openshift_etcd
| * | 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
|\ \ \ | | | | | | | | Fix resolv conf
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | According to the man page for resolv.conf # needs to be in the first collumn in order to start a comment. While this didn't seem to affect glibc's resolver it did really confuse the kubelet which parses the host's resolv.conf
* | | | Merge pull request #1908 from abutcher/openshift-certificatesJason DeTiberus2016-05-2619-289/+371
|\ \ \ \ | |_|_|/ |/| | | Refactor openshift certificate roles
| * | | 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
|\ \ \ | | | | | | | | Cloud provider cleanup
| * | | 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
| | | | | | | | | | | | | | | | some conditions
| * | | openstack_fixesJason DeTiberus2016-05-054-20/+39
| | | | | | | | | | | | | | | | - move openstack user-data content into heat template
| * | | libvirt_fixesJason DeTiberus2016-05-052-3/+33
| | | | | | | | | | | | | | | | - disable openshift_use_dnsmasq for libvirt
| * | | gce fixesJason DeTiberus2016-05-055-6/+583
| | | |
| * | | aws provider fixesJason DeTiberus2016-05-055-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix errors in userdata template - update origin centos ami - ensure ec2_tag_sub-host-type is set after launch - disable openshift_use_dnsmasq for now - Remove use of vars_files in includes
| * | | Call evaluate_groups from update_repos_and_packagesJason DeTiberus2016-05-051-0/+2
| | | |
* | | | Merge pull request #1942 from sdodson/bind_mountsAndrew Butcher2016-05-241-1/+12
|\ \ \ \ | |_|_|/ |/| | | Catch more uninstall targets
| * | | 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
| | | |
* | | | Merge pull request #1926 from sdodson/clarify-proxy-exampleAndrew Butcher2016-05-243-21/+24
|\ \ \ \ | |/ / / |/| | | Clarify the example inventory related to proxies and builddefaults
| * | | Clarify the example inventory related to proxies and builddefaultsScott Dodson2016-05-193-21/+24
| | |/ | |/|
* | | Conditionally bind mount /usr/bin/docker-current when it is present (#1941)Scott Dodson2016-05-247-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Conditionally bind mount /usr/bin/docker-current when it is present * fix upgrade * add atomic-openshift-node-dep files to uninstall playbook * Fix variable expansion
* | | Automatic commit of package [openshift-ansible] release [3.0.91-1].Troy Dawson2016-05-242-2/+36
| | |
* | | Merge pull request #1932 from jnordell/99-origin-dnsJason DeTiberus2016-05-231-2/+1
|\ \ \ | | | | | | | | 99-origin-dns.sh adds a comment to /etc/resolv.conf on every execution of NetworkManager dispatcher
| * | | Removed the echo line and replaced it with inline comment. To keep ↵Jonas Nordell2016-05-231-2/+1
| | | | | | | | | | | | | | | | 99-origin-dns.sh from adding a new line in /etc/resolv.conf everytime the NetworkManager dispatcher script is executed.
* | | | Merge pull request #1930 from abutcher/multiple-login-providersJason DeTiberus2016-05-232-4/+14
|\ \ \ \ | |/ / / |/| | | Allow multiple login providers
| * | | Extend multiple login provider check to include origin.Andrew Butcher2016-05-232-5/+14
| | | |
| * | | Allow multiple login providers post 3.2.Andrew Butcher2016-05-232-5/+6
|/ / /
* | | Merge pull request #1929 from lhuard1A/subscribe_ose_3.2Jason DeTiberus2016-05-231-1/+1
|\ \ \ | | | | | | | | Make rhel_subscribe role able to subscribe for OSE 3.2
| * | | 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.
| * | | Remove newline from docker_options template string.Andrew Butcher2016-05-191-3/+1
| |/ /
* | | Merge pull request #1924 from abutcher/BZ1337425Jason DeTiberus2016-05-201-0/+4
|\ \ \ | |/ / |/| | Bug 1337425 - [ansible-2.0] installer failed if yum-utils wasn't installed
| * | Ensure yum-utils installed.Andrew Butcher2016-05-191-0/+4
|/ /
* | Merge pull request #1914 from jkroepke/patch-1Jason DeTiberus2016-05-181-2/+2
|\ \ | | | | | | Task "Update router image to current version" failed, if router not in default namespace
| * | Task "Update router image to current version" failed, if router not in ↵Jan-Otto Kröpke2016-05-181-2/+2
| | | | | | | | | | | | | | | default namespace Also added hardcoded -n default to registry patch, since oc get has -n default, too.
* | | Merge pull request #1913 from maci0/patch-1Jason DeTiberus2016-05-181-1/+1
|\ \ \ | | | | | | | | docker-current was missing from the containerized atomic-openshift-no…
| * | | docker-current was missing from the containerized ↵Marcel Wysocki2016-05-181-1/+1
| |/ / | | | | | | | | | | | | atomic-openshift-node.service file This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1336780
* | | Merge pull request #1918 from dgoodwin/docker-restartJason DeTiberus2016-05-181-1/+2
|\ \ \ | | | | | | | | Use systemctl restart docker instead of ansible service.