summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1742 from dgoodwin/docker-loggingBrenton Leanhardt2016-04-206-6/+20
|\ | | | | Fixes For Docker Log Options
| * Use a JSON list for docker log options.Devan Goodwin2016-04-205-5/+19
| | | | | | | | | | | | | | Previously we expected you to comma separate, but this wasn't really clear. Insted we will use an explicit JSON list going forward. The comma separated list will be supported for backwards compatability.
| * Fix legacy cli_docker_* vars not migrating.Devan Goodwin2016-04-201-1/+1
|/ | | | | | No hosts were matching this renamed host group, so the oo_lookup module was not being triggered to migrate these to their new openshift_docker prefix.
* Merge pull request #1781 from dgoodwin/image-tag-ver-2Brenton Leanhardt2016-04-203-4/+5
|\ | | | | Fix use of older image tag version during upgrade.
| * Fix use of older image tag version during upgrade.Devan Goodwin2016-04-203-4/+5
|/ | | | | | | If doing an upgrade with a 3.2.0.x version that was older than the latest, the upgrade would actually use the latest in the systemd unit files and thus the actual containers that get used. (despite pulling down the correct version first)
* Merge pull request #1766 from abutcher/router-selectorBrenton Leanhardt2016-04-208-17/+51
|\ | | | | Bug 1328119 - router selector not obeyed
| * 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 ↵Andrew Butcher2016-04-209-8/+31
| | | | | | | | counting nodes.
* | Merge pull request #1582 from jdnieto/openshift_metricsBrenton Leanhardt2016-04-209-1/+162
|\ \ | | | | | | added new openshift-metrics service
| * | 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 1734
| * | Fixing the spec for PR 1734Brenton Leanhardt2016-04-201-81/+0
| |/
* | Merge pull request #1588 from sdodson/cluster-dnsBrenton Leanhardt2016-04-2024-24/+264
|\ \ | |/ |/| Cluster dns provided by dnsmasq
| * Add openshift_node_dnsmasqScott Dodson2016-04-1921-19/+239
| |
| * Promote portal_net to openshift.common, add kube_svc_ipScott Dodson2016-04-196-8/+28
|/ | | | | Conflicts: roles/openshift_facts/library/openshift_facts.py
* Merge pull request #1771 from sdodson/add-inventoriesBrenton Leanhardt2016-04-191-1/+4
|\ | | | | Add inventories to docs subpackage
| * 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
|\ \ | | | | | | Update inventory file for ansible playbook for OSE deployment.
| * | Reference Setup for Origin and Ose from up-to-date docs.openshift.[com|org] ↵Jan Chaloupka2016-04-123-442/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of local README_[origin|OSE].md Update inventory file for ansible playbook for OSE deployment. - enterprise value for deployment_type is depricated. Use openshift-enterprise instead. - key=value pairs must be on the same line
* | | Merge pull request #1734 from joelddiaz/tools-roles-moveJoel Diaz2016-04-19137-14190/+0
|\ \ \ | |_|/ |/| | cleanup roles after roles move to openshift-tools
| * | cleanup roles after roles move to openshift-toolsJoel Diaz2016-04-15137-14190/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also removing inventory/multi_inventory* things left behind unchanged even though they were copied: playbooks/adhoc/* roles/dns roles/kube_nfs_volumes roles/os_update_latest
* | | 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
|\ \ \ | | | | | | | | Use 'openshift3/' as IMAGE_PREFIX for enterprise logging and metrics
| * | | 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 master
| * | | | a-o-i: Don't assume storage on 1st masterSamuel Munilla2016-04-182-14/+38
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Always prompt the user for a storage host. The prompt defaults to the first master and warns the user not to use a container-based installation for this. WIP
* | | | Merge pull request #1762 from brenton/docker1Brenton Leanhardt2016-04-181-1/+1
|\ \ \ \ | |/ / / |/| | | Bug 1320829 - Handle OSE 3.0 installs
| * | | 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
|\ \ \ | | | | | | | | The openshift_docker role must set the version facts for containerize…
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.
* | | | Merge pull request #1755 from sdodson/docker-resetBrenton Leanhardt2016-04-151-14/+8
|\ \ \ \ | | | | | | | | | | Refactor docker failed state cleanup
| * | | | Refactor docker failed state cleanupScott Dodson2016-04-151-14/+8
| | | | |
* | | | | Merge pull request #1752 from sdodson/docker-resetBrenton Leanhardt2016-04-141-3/+15
|\| | | | | |/ / / |/| | | Enable docker before potentially resetting the failure
| * | | 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.
| * | | 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.
| * | | Support setting imagePolicyConfig JSON in inventory.Devan Goodwin2016-04-126-5/+27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | For flexibility this is another pure JSON field to translate directly to yaml in the master config. Also updated to more safely handle JSON inventory variables as this uncovered a bug with booleans where you end up with a string containing json in your yaml.
* | | 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 masters
| * | | Convert image_tag on mastersSamuel Munilla2016-04-121-1/+1
| | | | | | | | | | | | | | | | Also convert openshift_image_tag to and rpm versions for masters.
* | | | Merge pull request #1718 from brenton/docker1Brenton Leanhardt2016-04-1217-67/+93
|\ \ \ \ | | | | | | | | | | Containerized installs on RHEL were downgrading docker unnecessarily
| * | | | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 ↵Brenton Leanhardt2016-04-122-8/+25
| | | | | | | | | | | | | | | | | | | | containerized env
| * | | | Fixing non-HA master restart conditionalBrenton Leanhardt2016-04-121-1/+1
| | | | |
| * | | | Fetching the current version a little more carefullyBrenton Leanhardt2016-04-122-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were trying to use the running container to get the current version. There are cases in which the Master or Node may not be running during upgrade. It's actually safer to just run the container to fetch the version that would be launch if the container were running. Then we pull the image to see what the latest image contains.
| * | | | Make sure Docker is restarted after we have correctly configured the ↵Brenton Leanhardt2016-04-121-1/+5
| | | | | | | | | | | | | | | | | | | | containerized systemd units
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:29:35 +0000