Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into upgrade33 | Devan Goodwin | 2016-06-28 | 9 | -8/+43 |
|\ | |||||
| * | Add missing quote in metrics deployer template. | Devan Goodwin | 2016-06-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1927 from jfcoz/metrics_resolution | Scott Dodson | 2016-06-23 | 2 | -2/+2 |
| |\ | | | | | | | add unit in seconds for metrics resolution | ||||
| | * | default unit in openshift_facts | jfcoz | 2016-06-07 | 1 | -1/+1 |
| | | | |||||
| | * | add unit in seconds for metrics resolution | jfcoz | 2016-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2074 from tbielawa/networkmgr_changed | Andrew Butcher | 2016-06-23 | 1 | -5/+5 |
| |\ \ | | | | | | | | | NetworkManager service never changes | ||||
| | * | | NetworkManager service never changes | Tim Bielawa | 2016-06-22 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | * Don't ever report the NetworkManager service as changed when preparing to set the 'network_manager_active' fact | ||||
| * | | | Merge pull request #2025 from abutcher/global-env | Andrew Butcher | 2016-06-23 | 5 | -0/+31 |
| |\ \ \ | | | | | | | | | | | Per-service environment variables | ||||
| | * | | | Add per-service environment variables. | Andrew Butcher | 2016-06-13 | 5 | -0/+31 |
| | | | | | |||||
| * | | | | Add MODE to metrics deployer | Scott Dodson | 2016-06-23 | 1 | -1/+5 |
| | |/ / | |/| | | |||||
* | | | | Only nuke images when crossing the Docker 1.10 boundary in upgrade. | Devan Goodwin | 2016-06-27 | 2 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into upgrade33 | Devan Goodwin | 2016-06-23 | 17 | -201/+240 |
|\| | | | |||||
| * | | | Update the rest of the templates | Scott Dodson | 2016-06-22 | 9 | -130/+119 |
| | | | | |||||
| * | | | Update logging and metrics templates | Scott Dodson | 2016-06-22 | 4 | -63/+101 |
| | | | | |||||
| * | | | Merge pull request #2055 from sdodson/bz1347209 | Scott Dodson | 2016-06-17 | 1 | -7/+8 |
| |\ \ \ | | | | | | | | | | | Stop dumping debug output, re-try startng the node once | ||||
| | * | | | Add 30 second pause before retrying to start the node | Scott Dodson | 2016-06-17 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Stop dumping debug output, re-try startng the node once | Scott Dodson | 2016-06-16 | 1 | -8/+4 |
| | | | | | |||||
| * | | | | If registry_url != registry.access.redhat.com then modify image streams | Scott Dodson | 2016-06-17 | 2 | -0/+7 |
| |/ / / | |||||
| * | | | Merge pull request #2037 from ibotty/docker-current_fixes | Scott Dodson | 2016-06-15 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | also volume-mount /etc/sysconfig/docker | ||||
| | * | | | also volume-mount /etc/sysconfig/docker | Tobias Florek | 2016-06-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2038 from dgoodwin/node-dep-start | Scott Dodson | 2016-06-14 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | Attempt to fix containerized node start failure with Docker 1.10. | ||||
| | * | | | Attempt to fix containerized node start failure with Docker 1.10. | Devan Goodwin | 2016-06-14 | 1 | -0/+4 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that in some situations (can't reliably reproduce yet), node will fail to start. This appears to be related to the node-dep service and possibly it's environment file. This file is also an EnvironmentFile for the node service, but it's only created by the node-dep service, and it looks like it may try to read it's environment before the node-dep service has fully started and created the file. Workaround with a an explicit service start. | ||||
* | | | | Add missing defaults file. | Devan Goodwin | 2016-06-22 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix docker restarts during openshift_version role. | Devan Goodwin | 2016-06-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable here must be explicitly passed to the docker role, if it's passed sometimes and not others, the docker config changes triggers a docker restart effectively killing everything on the node in an unsafe manner. Instead lets make sure the value is set. | ||||
* | | | | Support setting a docker version in inventory. | Devan Goodwin | 2016-06-20 | 1 | -1/+36 |
| | | | | |||||
* | | | | Fix version facts with trailing newline. | Devan Goodwin | 2016-06-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Normalize some of the version inventory vars which users might mistakenly ↵ | Devan Goodwin | 2016-06-17 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | enter wrong. | ||||
* | | | | Check that detected version matches openshift_release in rpm installations. | Devan Goodwin | 2016-06-17 | 1 | -5/+10 |
| | | | | |||||
* | | | | Block attempts to install origin without specifying any release info. | Devan Goodwin | 2016-06-17 | 1 | -0/+7 |
| | | | | |||||
* | | | | More stable lookup of running openshift version. | Devan Goodwin | 2016-06-17 | 1 | -14/+15 |
| | | | | |||||
* | | | | Fix typo in facts. | Devan Goodwin | 2016-06-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Cleanup, fix 3.1 version bug in facts. | Devan Goodwin | 2016-06-16 | 1 | -12/+11 |
| | | | | |||||
* | | | | More version fixes. | Devan Goodwin | 2016-06-16 | 3 | -10/+2 |
| | | | | |||||
* | | | | Support origin alpha tags. | Devan Goodwin | 2016-06-15 | 3 | -4/+17 |
| | | | | |||||
* | | | | More stable containerized version lookup. | Devan Goodwin | 2016-06-15 | 1 | -1/+21 |
| | | | | |||||
* | | | | Fix performance hit in openshift_facts. | Devan Goodwin | 2016-06-15 | 1 | -5/+0 |
| | | | | |||||
* | | | | Always populate openshift_image_tag and openshift_pkg_version. | Devan Goodwin | 2016-06-15 | 14 | -28/+41 |
| | | | | | | | | | | | | | | | | | | | | Allows the use of arbitrary tags, precise control over containers and rpms, and likely mixed environments. | ||||
* | | | | Remove the use of the upgrading variable. | Devan Goodwin | 2016-06-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | Restore 3.2 RPM version check before upgrading. | Devan Goodwin | 2016-06-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | Make openshift_version role docker dep conditional. | Devan Goodwin | 2016-06-13 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix rpm installs. | Devan Goodwin | 2016-06-13 | 3 | -8/+11 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into upgrade33 | Devan Goodwin | 2016-06-13 | 1 | -28/+0 |
|\| | | | |||||
| * | | | Remove Docker 1.10 requirement temporarily. | Devan Goodwin | 2016-06-10 | 1 | -28/+0 |
| |/ / | | | | | | | | | | | | | | | | Docker 1.10 is not widely available in RHEL / CentOS yet, lets remove the restriction for users of master / origin. We can revert as soon as it's available publically. | ||||
* | | | Remove unused docker facts tasks. | Devan Goodwin | 2016-06-10 | 1 | -21/+0 |
| | | | |||||
* | | | Merge branch 'master' into upgrade33 | Devan Goodwin | 2016-06-10 | 8 | -54/+52 |
|\| | | |||||
| * | | Merge pull request #2007 from bachp/lowercase-proxy-vars | Scott Dodson | 2016-06-09 | 2 | -0/+12 |
| |\ \ | | | | | | | | | Add lower case proxy variables | ||||
| | * | | Add lower case proxy variables | Pascal Bach | 2016-06-09 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some applications expect the *_PROXY variables to be lower case. To support this too inject them in addition to the upper case ones. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Reviewed-by: Fabio Huser <fabio.huser@siemens.com> | ||||
| * | | | Merge pull request #2005 from brenton/bz1338726 | Brenton Leanhardt | 2016-06-09 | 6 | -47/+41 |
| |\ \ \ | | | | | | | | | | | Bug 1338726 - never abort install if the latest version of docker is already installed | ||||
| | * | | | Restore mistakenly reverted code. | Devan Goodwin | 2016-06-09 | 2 | -8/+13 |
| | | | | | |||||
| | * | | | Bug 1338726 - never abort install if the latest version of docker is already ↵ | Brenton Leanhardt | 2016-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | installed |