summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1781 from dgoodwin/image-tag-ver-2Brenton Leanhardt2016-04-203-4/+5
|\
| * Fix use of older image tag version during upgrade.Devan Goodwin2016-04-203-4/+5
|/
* Merge pull request #1766 from abutcher/router-selectorBrenton Leanhardt2016-04-208-17/+51
|\
| * Translate legacy facts within the oo_openshift_env filter.Andrew Butcher2016-04-202-7/+8
| * Remove empty facts from nested dictionaries.Andrew Butcher2016-04-201-8/+18
| * Fix router selector fact migration and match multiple selectors when counting...Andrew Butcher2016-04-209-8/+31
* | Merge pull request #1582 from jdnieto/openshift_metricsBrenton Leanhardt2016-04-209-1/+162
|\ \
| * | added new openshift-metrics serviceJose David Martin Nieto2016-04-209-1/+162
* | | Merge pull request #1774 from brenton/specfixes1Brenton Leanhardt2016-04-201-81/+0
|\ \ \ | |_|/ |/| |
| * | Fixing the spec for PR 1734Brenton Leanhardt2016-04-201-81/+0
| |/
* | Merge pull request #1588 from sdodson/cluster-dnsBrenton Leanhardt2016-04-2024-24/+264
|\ \ | |/ |/|
| * Add openshift_node_dnsmasqScott Dodson2016-04-1921-19/+239
| * Promote portal_net to openshift.common, add kube_svc_ipScott Dodson2016-04-196-8/+28
|/
* Merge pull request #1771 from sdodson/add-inventoriesBrenton Leanhardt2016-04-191-1/+4
|\
| * Add example inventories to docs, install docs by defaultScott Dodson2016-04-191-1/+4
* | Merge pull request #1739 from ingvagabund/update-inventory-file-for-ose-playbookBrenton Leanhardt2016-04-193-442/+2
|\ \
| * | Reference Setup for Origin and Ose from up-to-date docs.openshift.[com|org] i...Jan Chaloupka2016-04-123-442/+2
* | | Merge pull request #1734 from joelddiaz/tools-roles-moveJoel Diaz2016-04-19137-14190/+0
|\ \ \ | |_|/ |/| |
| * | cleanup roles after roles move to openshift-toolsJoel Diaz2016-04-15137-14190/+0
* | | Automatic commit of package [openshift-ansible] release [3.0.81-1].Brenton Leanhardt2016-04-182-2/+7
* | | Merge pull request #1763 from sdodson/image-stream-syncBrenton Leanhardt2016-04-181-1/+1
|\ \ \
| * | | IMAGE_PREFIX=openshift3/ for enterprise logging/metricsScott Dodson2016-04-181-1/+1
* | | | Merge pull request #1764 from smunilla/BZ1327139Brenton Leanhardt2016-04-182-14/+38
|\ \ \ \
| * | | | a-o-i: Don't assume storage on 1st masterSamuel Munilla2016-04-182-14/+38
|/ / / /
* | | | Merge pull request #1762 from brenton/docker1Brenton Leanhardt2016-04-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bug 1320829 - Handle OSE 3.0 installsBrenton Leanhardt2016-04-181-1/+1
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.0.80-1].Troy Dawson2016-04-152-2/+12
* | | Merge pull request #1746 from brenton/docker1Brenton Leanhardt2016-04-1510-39/+57
|\ \ \
| * | | Support mixed RPM/container installsBrenton Leanhardt2016-04-142-6/+6
| * | | The openshift_docker role must set the version facts for containerized installsBrenton Leanhardt2016-04-149-37/+55
* | | | Merge pull request #1755 from sdodson/docker-resetBrenton Leanhardt2016-04-151-14/+8
|\ \ \ \
| * | | | Refactor docker failed state cleanupScott Dodson2016-04-151-14/+8
* | | | | Merge pull request #1752 from sdodson/docker-resetBrenton Leanhardt2016-04-141-3/+15
|\| | | | | |/ / / |/| | |
| * | | start it, check for failure, reset it, start againScott Dodson2016-04-141-8/+11
| * | | Enable docker before potentially resetting the failureScott Dodson2016-04-141-1/+10
* | | | Merge pull request #1753 from abutcher/mapping-methodBrenton Leanhardt2016-04-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix mappingMethod option in identity provider.Andrew Butcher2016-04-141-1/+1
|/ / /
* | | Merge pull request #1738 from dgoodwin/image-policy-configBrenton Leanhardt2016-04-136-5/+27
|\ \ \
| * | | Support setting imagePolicyConfig JSON in inventory.Devan Goodwin2016-04-126-5/+27
| |/ /
* | | Automatic commit of package [openshift-ansible] release [3.0.79-1].Brenton Leanhardt2016-04-122-2/+17
* | | Merge pull request #1744 from smunilla/BZ1323918Brenton Leanhardt2016-04-121-1/+1
|\ \ \
| * | | Convert image_tag on mastersSamuel Munilla2016-04-121-1/+1
* | | | Merge pull request #1718 from brenton/docker1Brenton Leanhardt2016-04-1217-67/+93
|\ \ \ \
| * | | | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 contain...Brenton Leanhardt2016-04-122-8/+25
| * | | | Fixing non-HA master restart conditionalBrenton Leanhardt2016-04-121-1/+1
| * | | | Fetching the current version a little more carefullyBrenton Leanhardt2016-04-122-5/+9
| * | | | Make sure Docker is restarted after we have correctly configured the containe...Brenton Leanhardt2016-04-121-1/+5
| * | | | use RestartSec to avoid default rate limit in systemdBrenton Leanhardt2016-04-128-0/+8
| * | | | Installs and upgrades from authenticated registries are not supported for nowBrenton Leanhardt2016-04-121-31/+0
| * | | | Handle cases where the pacemaker variables aren't setBrenton Leanhardt2016-04-121-1/+1