Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Conditionally bind mount /usr/bin/docker-current when it is present (#1941) | Scott Dodson | 2016-05-24 | 7 | -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 Dawson | 2016-05-24 | 2 | -2/+36 |
| | |||||
* | 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. | ||||
* | | Merge pull request #1930 from abutcher/multiple-login-providers | Jason DeTiberus | 2016-05-23 | 2 | -4/+14 |
|\ \ | |/ |/| | Allow multiple login providers | ||||
| * | Extend multiple login provider check to include origin. | Andrew Butcher | 2016-05-23 | 2 | -5/+14 |
| | | |||||
| * | Allow multiple login providers post 3.2. | Andrew Butcher | 2016-05-23 | 2 | -5/+6 |
|/ | |||||
* | Merge pull request #1929 from lhuard1A/subscribe_ose_3.2 | Jason DeTiberus | 2016-05-23 | 1 | -1/+1 |
|\ | | | | | Make rhel_subscribe role able to subscribe for OSE 3.2 | ||||
| * | 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 |
| | | |||||
* | | Merge pull request #1924 from abutcher/BZ1337425 | Jason DeTiberus | 2016-05-20 | 1 | -0/+4 |
|\ \ | |/ |/| | Bug 1337425 - [ansible-2.0] installer failed if yum-utils wasn't installed | ||||
| * | Ensure yum-utils installed. | Andrew Butcher | 2016-05-19 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #1914 from jkroepke/patch-1 | Jason DeTiberus | 2016-05-18 | 1 | -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öpke | 2016-05-18 | 1 | -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-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 #1918 from dgoodwin/docker-restart | Jason DeTiberus | 2016-05-18 | 1 | -1/+2 |
|\ \ | | | | | | | Use systemctl restart docker instead of ansible service. | ||||
| * | | Use systemctl restart docker instead of ansible service. | Devan Goodwin | 2016-05-18 | 1 | -1/+2 |
| |/ | | | | | | | | | | | | | Ansible is doing a full service stop and then start, which does not allow systemd to keep the containerized services up and running. Switching to this will cause the related services to come back within a few seconds. | ||||
* | | 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 |
| |/ | |||||
* | | Merge pull request #1909 from sdodson/BZ1336647 | Jason DeTiberus | 2016-05-18 | 1 | -1/+23 |
|\ \ | | | | | | | Fix playbooks/openshift-master/library move to symlink | ||||
| * | | Fix playbooks/openshift-master/library move to symlink | Scott Dodson | 2016-05-18 | 1 | -1/+23 |
| |/ | |||||
* | | Merge pull request #1900 from sdodson/fix-rhel_subscribe | Jason DeTiberus | 2016-05-18 | 4 | -11/+40 |
|\ \ | |/ |/| | Fix rhel_subscribe | ||||
| * | Refactor where we compute no_proxy hostnames | Scott Dodson | 2016-05-17 | 3 | -11/+22 |
| | | |||||
| * | Fix for ansible v2 | Scott Dodson | 2016-05-17 | 1 | -3/+17 |
| | | |||||
| * | Fix rhel_subscribe | Scott Dodson | 2016-05-17 | 2 | -2/+6 |
|/ | |||||
* | Merge pull request #1886 from smunilla/BZ1331239 | Jason DeTiberus | 2016-05-17 | 1 | -1/+3 |
|\ | | | | | a-o-i: No proxy questions for 3.0/3.1 | ||||
| * | a-o-i: No proxy questions for 3.0/3.1 | Samuel Munilla | 2016-05-16 | 1 | -1/+3 |
| | | | | | | | | | | | | Global proxies were not supported until 3.2 so if a lesser version is specified then we don't need to ask for it. | ||||
* | | Merge pull request #1907 from cboggs/fix-issue-1906 | Jason DeTiberus | 2016-05-17 | 3 | -3/+3 |
|\ \ | | | | | | | Issue 1906: Remove interpolated g_all_hosts with_items arg from upgrade playbooks | ||||
| * | | remove interpolated g_all_hosts with_items arg from upgrade playbooks | Cody Boggs | 2016-05-17 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #1897 from sdodson/issue1435 | Jason DeTiberus | 2016-05-17 | 1 | -2/+2 |
|\ \ | | | | | | | Include sdn-ovs in upgrade commands to avoid pulling in newer packages | ||||
| * | | Fix minor upgrades in 3.1 | Scott Dodson | 2016-05-16 | 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 #1811 from sdodson/dont-pull-cli-on-upgrade | Jason DeTiberus | 2016-05-17 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Don't pull cli image when we're not containerized | ||||
| * | | | Don't pull cli image when we're not containerized | Scott Dodson | 2016-04-26 | 1 | -0/+1 |
| | | | | |||||
* | | | | 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. | ||||
| * | | | | Fix 'recursive loop detected in template string' for upgrading variable. | Andrew Butcher | 2016-05-16 | 3 | -6/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1876 from abutcher/openshift-common-hostname | Jason DeTiberus | 2016-05-17 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix proxy facts | ||||
| * | | | | | Set openshift.common.hostname early in playbook execution. | Andrew Butcher | 2016-05-17 | 1 | -1/+4 |
|/ / / / / | |||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.0.90-1]. | Troy Dawson | 2016-05-16 | 2 | -2/+83 |
| | | | | | |||||
* | | | | | Merge pull request #1880 from dgoodwin/registry-insecure | Brenton Leanhardt | 2016-05-16 | 6 | -12/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes for openshift_docker_hosted_registry_insecure var. | ||||
| * | | | | | Fixes for openshift_docker_hosted_registry_insecure var. | Devan Goodwin | 2016-05-16 | 6 | -12/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a failure on masters if you explicitly set openshift_docker_hosted_registry_insecure=true. This is the default but if you tried to set it an error would trigger as a relevant variable was not passed in the master playbooks. Fixes setting the variable to false being ignored. master/node playbooks were referencing the docker fact, which was not set at that point and thus we were always getting the default of true, regardless what was in your inventory. Stop passing registry insecure in via playbooks, we can access it when running openshift_facts itself. Add a new default in openshift facts. | ||||
* | | | | | | Merge pull request #1890 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-05-16 | 16 | -38/+100 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Image stream sync | ||||
| * | | | | | Move latest to v1.2 | Scott Dodson | 2016-05-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Sync latest content | Scott Dodson | 2016-05-16 | 15 | -37/+99 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1859 from dgoodwin/containerized-upgrade | Brenton Leanhardt | 2016-05-16 | 6 | -9/+31 |
|\ \ \ \ \ | |/ / / / |/| | | | | Containerized Upgrade Fixes |