Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into upgrade33 | Devan Goodwin | 2016-05-31 | 14 | -301/+103 |
|\ | |||||
| * | Revert openshift-certificates changes. | Andrew Butcher | 2016-05-30 | 17 | -357/+132 |
| | | |||||
* | | Add leading v for remaining IMAGE_VERSION templates. | Devan Goodwin | 2016-05-30 | 2 | -2/+2 |
| | | |||||
* | | Fix error restarting master service that may not be there. | Devan Goodwin | 2016-05-30 | 1 | -2/+7 |
| | | |||||
* | | Fix use of openshift_version in ca role. | Devan Goodwin | 2016-05-30 | 1 | -4/+1 |
| | | |||||
* | | Fix error with containerized etcd install. | Devan Goodwin | 2016-05-30 | 1 | -6/+6 |
| | | | | | | | | | | Role was assuming it could successfully disable the rpm etcd service without checking if it was actuall present. | ||||
* | | Merge remote-tracking branch 'upstream/master' into upgrade33 | Devan Goodwin | 2016-05-30 | 33 | -260/+495 |
|\| | |||||
| * | 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 |
| | |/ | |||||
* | | | Refactor openshift_version behavior. | Devan Goodwin | 2016-05-30 | 2 | -2/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very early in playbooks we must init the openshift_version for each host. First we determine it for the master, logic now is pushed into the openshift_docker role which we run only on first master via openshift_cli. Facts are reloaded leaving us with a first master with openshift.common.version fact we can then re-use on all other hosts. The correct version of docker should be installed as well. We then set openshift_version for all other hosts by re-using the master fact. | ||||
* | | | Get rpm installations functional again. | Devan Goodwin | 2016-05-26 | 4 | -16/+30 |
| | | | |||||
* | | | Convert generic openshift_version=3.2 to specific early in install. | Devan Goodwin | 2016-05-25 | 1 | -0/+12 |
| | | | |||||
* | | | Fix version compare with using just 3.2 or 1.2. | Devan Goodwin | 2016-05-25 | 1 | -2/+2 |
| | | | |||||
* | | | Hookup node configuration. | Devan Goodwin | 2016-05-25 | 4 | -6/+11 |
| | | | |||||
* | | | Complete installation of first master containerized. | Devan Goodwin | 2016-05-25 | 2 | -3/+2 |
| | | | |||||
* | | | Stop downgrading Docker because we don't know what version to install yet. | Devan Goodwin | 2016-05-25 | 1 | -4/+10 |
| | | | |||||
* | | | Work towards determining openshift_version when unspecified. | Devan Goodwin | 2016-05-25 | 11 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | openshift_docker role was largely useless now, but also almost did what we needed. (deps ordering still needs to be changed) Remove defaulting of openshift_version. | ||||
* | | | Remove now unnecessary pull and ver check in openshift_docker role. | Devan Goodwin | 2016-05-25 | 1 | -36/+0 |
| | | | |||||
* | | | Set openshift_version in config playbooks for first master. | Devan Goodwin | 2016-05-25 | 6 | -16/+10 |
| | | | | | | | | | | | | | | | | | | | | | Starting to remove openshift.docker.openshift_version fact usage. openshift_version should no longer contain a leading 'v' for containerized installs, just a version number. | ||||
* | | | Debug output. | Devan Goodwin | 2016-05-25 | 3 | -0/+11 |
|/ / | |||||
* | | 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. | ||||
| * | Check consumed pools prior to attaching. | Andrew Butcher | 2016-03-31 | 1 | -0/+11 |
| | | |||||
* | | Merge pull request #1899 from abutcher/v2-recursive-loop | Jason DeTiberus | 2016-05-17 | 3 | -6/+3 |
|\ \ | | | | | | | Fix 'recursive loop detected in template string' for upgrading variable. |