summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | | | |
* | | | | Merge pull request #1880 from dgoodwin/registry-insecureBrenton Leanhardt2016-05-166-12/+6
|\ \ \ \ \ | | | | | | | | | | | | Fixes for openshift_docker_hosted_registry_insecure var.
| * | | | | Fixes for openshift_docker_hosted_registry_insecure var.Devan Goodwin2016-05-166-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-syncBrenton Leanhardt2016-05-1616-38/+100
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Image stream sync
| * | | | | Move latest to v1.2Scott Dodson2016-05-161-1/+1
| | | | | |
| * | | | | Sync latest contentScott Dodson2016-05-1615-37/+99
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1859 from dgoodwin/containerized-upgradeBrenton Leanhardt2016-05-166-9/+31
|\ \ \ \ \ | |/ / / / |/| | | | Containerized Upgrade Fixes
| * | | | Fixed openvswitch not upgrading.Devan Goodwin2016-05-122-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was a missing restart as systemd file did not change, so no notification was triggered. Added a notification on a file that contains the image version which does change. This exposed a bug where openvswitch shuts down the node and you return to no functioning nodes. Fixed by reordering the handlers so openvswitch restarts first.
| * | | | Do not upgrade containers to latest avail during a normal config run.Devan Goodwin2016-05-124-6/+25
| | | | |
* | | | | Merge pull request #1891 from sosiouxme/20160613-update-logging-originJason DeTiberus2016-05-152-9/+21
|\ \ \ \ \ | | | | | | | | | | | | update origin logging and metrics deployer templates
| * | | | | update logging and metrics deployer templatesLuke Meyer2016-05-132-9/+21
| | | | | |
* | | | | | Merge pull request #1888 from maci0/masterJason DeTiberus2016-05-143-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update default max-pods parameter
| * | | | | | Update default max-pods parameterMarcel Wysocki2016-05-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the openshift_node_kubelet_args max-pods parameter from 40 to 110 which is the new number of maximum supported pods per node in OSE 3.2. The inventory file should reflect this.