summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1930 from abutcher/multiple-login-providersJason DeTiberus2016-05-232-4/+14
|\
| * 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.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.Andrew Butcher2016-05-191-3/+1
* | Merge pull request #1924 from abutcher/BZ1337425Jason DeTiberus2016-05-201-0/+4
|\ \ | |/ |/|
| * 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 defaul...Jan-Otto Kröpke2016-05-181-2/+2
* | Merge pull request #1913 from maci0/patch-1Jason DeTiberus2016-05-181-1/+1
|\ \
| * | docker-current was missing from the containerized atomic-openshift-node.servi...Marcel Wysocki2016-05-181-1/+1
| |/
* | Merge pull request #1918 from dgoodwin/docker-restartJason DeTiberus2016-05-181-1/+2
|\ \
| * | Use systemctl restart docker instead of ansible service.Devan Goodwin2016-05-181-1/+2
| |/
* | Merge pull request #1911 from jdnieto/fix_hawkular_variable_templatesJason DeTiberus2016-05-181-3/+2
|\ \
| * | 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 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 symlinkScott Dodson2016-05-181-1/+23
| |/
* | Merge pull request #1900 from sdodson/fix-rhel_subscribeJason DeTiberus2016-05-184-11/+40
|\ \ | |/ |/|
| * 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.1Samuel Munilla2016-05-161-1/+3
* | Merge pull request #1907 from cboggs/fix-issue-1906Jason DeTiberus2016-05-173-3/+3
|\ \
| * | 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
|\ \
| * | 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.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 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.Andrew Butcher2016-05-163-6/+3
* | | | | Merge pull request #1876 from abutcher/openshift-common-hostnameJason DeTiberus2016-05-171-1/+4
|\ \ \ \ \
| * | | | | 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.Devan Goodwin2016-05-166-12/+6
* | | | | | Merge pull request #1890 from sdodson/image-stream-syncBrenton Leanhardt2016-05-1616-38/+100
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed openvswitch not upgrading.Devan Goodwin2016-05-122-3/+6
| * | | | 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 logging and metrics deployer templatesLuke Meyer2016-05-132-9/+21