summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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.
| * | Use systemctl restart docker instead of ansible service.Devan Goodwin2016-05-181-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_templatesJason DeTiberus2016-05-181-3/+2
|\ \ | | | | | | fixed issue with blank spaces instead commas
| * | fixed issue with blank spaces instead commas as variables template separatorsJose David Martin Nieto2016-05-181-3/+2
| |/
* | Merge pull request #1917 from vishpat/haJason DeTiberus2016-05-182-1/+3
|\ \ | | | | | | Use cluster hostname while generating certificate on the master nodes
| * | Use cluster hostname while generating certificate on the master nodesVishal Patil2016-05-182-1/+3
| |/
* | Merge pull request #1909 from sdodson/BZ1336647Jason DeTiberus2016-05-181-1/+23
|\ \ | | | | | | Fix playbooks/openshift-master/library move to symlink
| * | Fix playbooks/openshift-master/library move to symlinkScott Dodson2016-05-181-1/+23
| |/
* | Merge pull request #1900 from sdodson/fix-rhel_subscribeJason DeTiberus2016-05-184-11/+40
|\ \ | |/ |/| Fix rhel_subscribe
| * Refactor where we compute no_proxy hostnamesScott Dodson2016-05-173-11/+22
| |
| * Fix for ansible v2Scott Dodson2016-05-171-3/+17
| |
| * Fix rhel_subscribeScott Dodson2016-05-172-2/+6
|/
* Merge pull request #1886 from smunilla/BZ1331239Jason DeTiberus2016-05-171-1/+3
|\ | | | | a-o-i: No proxy questions for 3.0/3.1
| * a-o-i: No proxy questions for 3.0/3.1Samuel Munilla2016-05-161-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-1906Jason DeTiberus2016-05-173-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 playbooksCody Boggs2016-05-173-3/+3
|/ /
* | Merge pull request #1897 from sdodson/issue1435Jason DeTiberus2016-05-171-2/+2
|\ \ | | | | | | Include sdn-ovs in upgrade commands to avoid pulling in newer packages
| * | Fix minor upgrades in 3.1Scott Dodson2016-05-161-2/+2
| |/
* | Merge pull request #1691 from abutcher/rhel-subscribeJason DeTiberus2016-05-171-0/+11
|\ \ | | | | | | Check consumed pools prior to attaching.
| * | Check consumed pools prior to attaching.Andrew Butcher2016-03-311-0/+11
| | |
* | | Merge pull request #1811 from sdodson/dont-pull-cli-on-upgradeJason DeTiberus2016-05-171-0/+1
|\ \ \ | | | | | | | | Don't pull cli image when we're not containerized
| * | | Don't pull cli image when we're not containerizedScott Dodson2016-04-261-0/+1
| | | |
* | | | Merge pull request #1899 from abutcher/v2-recursive-loopJason DeTiberus2016-05-173-6/+3
|\ \ \ \ | | | | | | | | | | Fix 'recursive loop detected in template string' for upgrading variable.
| * | | | Fix 'recursive loop detected in template string' for upgrading variable.Andrew Butcher2016-05-163-6/+3
| | | | |
* | | | | Merge pull request #1876 from abutcher/openshift-common-hostnameJason DeTiberus2016-05-171-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix proxy facts
| * | | | | Set openshift.common.hostname early in playbook execution.Andrew Butcher2016-05-171-1/+4
|/ / / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.0.90-1].Troy Dawson2016-05-162-2/+83
| | | | |