Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1973 from ibotty/preserve_htpasswd | Scott Dodson | 2016-06-06 | 2 | -1/+10 |
|\ | | | | | Add flag to manage htpasswd, or not. | ||||
| * | ensure htpasswd file exists | Tobias Florek | 2016-06-06 | 1 | -1/+9 |
| | | | | | | | | Also move file mode to the file-exists check to not specify twice. | ||||
| * | Add flag to manage htpasswd, or not. | Tobias Florek | 2016-06-02 | 2 | -1/+2 |
| | | | | | | | | | | Setting `openshift_master_manage_htpasswd` falsy will disable managing the htpasswd file. It won't get overwritten/generated. | ||||
* | | Update main.yaml | Jason DeTiberus | 2016-06-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1976 from abutcher/default-log-driver | Jason DeTiberus | 2016-06-03 | 1 | -1/+3 |
|\ \ | | | | | | | Configure default docker logging options. | ||||
| * | | Configure default docker logging options. | Andrew Butcher | 2016-06-02 | 1 | -1/+3 |
| |/ | |||||
* | | XPAAS v1.3.1 content for Origin 1.1 / OSE 3.1 | Scott Dodson | 2016-06-02 | 18 | -70/+1721 |
| | | |||||
* | | XPAAS v1.3.1 release for Origin 1.2 / OSE 3.2 | Scott Dodson | 2016-06-02 | 19 | -71/+1722 |
| | | |||||
* | | Merge pull request #1971 from dgoodwin/missing-services-fix | Jason DeTiberus | 2016-06-02 | 2 | -8/+13 |
|\ \ | |/ |/| | Fix error with stopping services that may not exist. | ||||
| * | Fix error with stopping services that may not exist. | Devan Goodwin | 2016-06-02 | 2 | -8/+13 |
| | | | | | | | | | | | | Causes a hard failure due to missing etcd/atomic-openshift-master services. Instead, check that the services exist before ensuring they're stopped/disabled. | ||||
* | | Merge pull request #1968 from abutcher/os-firewall-eval | Jason DeTiberus | 2016-06-01 | 10 | -39/+35 |
|\ \ | | | | | | | [v2] Move os_firewall_allow from defaults to role dependencies. | ||||
| * | | Add haproxy_frontend_port to vars for openshift-loadbalancer. | Andrew Butcher | 2016-06-01 | 2 | -8/+7 |
| | | | |||||
| * | | Move os_firewall_allow from defaults to role dependencies. | Andrew Butcher | 2016-06-01 | 8 | -31/+28 |
| |/ | |||||
* | | Merge pull request #1957 from jfcoz/metrics_wait_deployer | Jason DeTiberus | 2016-06-01 | 1 | -0/+8 |
|\ \ | |/ |/| | wait metrics-deployer complete (need to configure nodes before hosted… | ||||
| * | wait metrics-deployer complete (need to configure nodes before hosted services) | jfcoz | 2016-05-27 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #1685 from detiber/centos_sig | Jason DeTiberus | 2016-05-31 | 3 | -4/+20 |
|\ \ | | | | | | | Switch to using CentOS SIG repos for Origin installs | ||||
| * | | switch to using sig release packages | Jason DeTiberus | 2016-05-26 | 3 | -9/+20 |
| | | | |||||
| * | | temporarily disable gpg checking until we have a way to cleanly enable it | Jason DeTiberus | 2016-05-26 | 1 | -1/+1 |
| | | | |||||
| * | | Switch to using CentOS SIG repos for Origin installs | Jason DeTiberus | 2016-05-26 | 2 | -0/+5 |
| | | | |||||
* | | | Revert openshift-certificates changes. | Andrew Butcher | 2016-05-30 | 17 | -357/+132 |
| | | | |||||
* | | | Merge pull request #1896 from abutcher/openshift-loadbalancer | Jason DeTiberus | 2016-05-27 | 8 | -52/+91 |
|\ \ \ | | | | | | | | | Separate master and haproxy config playbooks. | ||||
| * | | | Separate master and haproxy config playbooks. | Andrew Butcher | 2016-05-26 | 8 | -52/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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-bin | Jason DeTiberus | 2016-05-27 | 6 | -104/+0 |
|\ \ \ \ | |_|/ / |/| | | | Cleanup following move to openshift-tools | ||||
| * | | | Cleanup bin, test and roles/openshift_ansible_inventory following move to ↵ | Andrew Butcher | 2016-05-25 | 6 | -104/+0 |
| | | | | | | | | | | | | | | | | openshift-tools | ||||
* | | | | Merge pull request #1672 from jstuever/os_clocks | Jason DeTiberus | 2016-05-26 | 6 | -0/+43 |
|\ \ \ \ | |_|/ / |/| | | | Add openshift_clock role | ||||
| * | | | Enable openshift_clock role for openshift_master, openshift_node, and ↵ | Jeremiah Stuever | 2016-05-20 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | openshift_etcd | ||||
| * | | | Add openshift_clock role to manage system clocks | Jeremiah Stuever | 2016-05-20 | 2 | -0/+29 |
| | | | | |||||
| * | | | Allow clock role in openshift_facts | Jeremiah Stuever | 2016-05-20 | 1 | -0/+11 |
| | |/ | |/| | |||||
* | | | Merge pull request #1952 from sdodson/fix-resolv-conf | Scott Dodson | 2016-05-26 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Fix resolv conf | ||||
| * | | | Use grep to decide when to add our comment | Scott Dodson | 2016-05-26 | 1 | -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-certificates | Jason DeTiberus | 2016-05-26 | 17 | -132/+357 |
|\ \ \ | |/ / |/| | | Refactor openshift certificate roles | ||||
| * | | Consolidate ca/master/node certificates roles into openshift_certificates. | Andrew Butcher | 2016-05-19 | 17 | -132/+357 |
| |/ | |||||
* | | Conditionally bind mount /usr/bin/docker-current when it is present (#1941) | Scott Dodson | 2016-05-24 | 4 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Merge pull request #1932 from jnordell/99-origin-dns | Jason DeTiberus | 2016-05-23 | 1 | -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 Nordell | 2016-05-23 | 1 | -2/+1 |
| | | | | | | | | | | | | 99-origin-dns.sh from adding a new line in /etc/resolv.conf everytime the NetworkManager dispatcher script is executed. | ||||
* | | | Extend multiple login provider check to include origin. | Andrew Butcher | 2016-05-23 | 1 | -1/+1 |
| | | | |||||
* | | | Allow multiple login providers post 3.2. | Andrew Butcher | 2016-05-23 | 1 | -1/+1 |
|/ / | |||||
* | | Make rhel_subscribe role able to subscribe for OSE 3.2 | Lénaïc Huard | 2016-05-23 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1923 from abutcher/BZ1337438 | Jason DeTiberus | 2016-05-20 | 1 | -3/+1 |
|\ \ | | | | | | | Remove newline from docker_options template string. | ||||
| * | | Remove newline from docker_options template string. | Andrew Butcher | 2016-05-19 | 1 | -3/+1 |
| |/ | |||||
* / | Ensure yum-utils installed. | Andrew Butcher | 2016-05-19 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #1913 from maci0/patch-1 | Jason DeTiberus | 2016-05-18 | 1 | -1/+1 |
|\ | | | | | docker-current was missing from the containerized atomic-openshift-no… | ||||
| * | docker-current was missing from the containerized ↵ | Marcel Wysocki | 2016-05-18 | 1 | -1/+1 |
| | | | | | | | | | | atomic-openshift-node.service file This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1336780 | ||||
* | | Merge pull request #1911 from jdnieto/fix_hawkular_variable_templates | Jason DeTiberus | 2016-05-18 | 1 | -3/+2 |
|\ \ | | | | | | | fixed issue with blank spaces instead commas | ||||
| * | | fixed issue with blank spaces instead commas as variables template separators | Jose David Martin Nieto | 2016-05-18 | 1 | -3/+2 |
| |/ | |||||
* | | Merge pull request #1917 from vishpat/ha | Jason DeTiberus | 2016-05-18 | 2 | -1/+3 |
|\ \ | | | | | | | Use cluster hostname while generating certificate on the master nodes | ||||
| * | | Use cluster hostname while generating certificate on the master nodes | Vishal Patil | 2016-05-18 | 2 | -1/+3 |
| |/ | |||||
* | | Refactor where we compute no_proxy hostnames | Scott Dodson | 2016-05-17 | 1 | -11/+1 |
| | | |||||
* | | Fix rhel_subscribe | Scott Dodson | 2016-05-17 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1691 from abutcher/rhel-subscribe | Jason DeTiberus | 2016-05-17 | 1 | -0/+11 |
|\ | | | | | Check consumed pools prior to attaching. |