Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1766 from abutcher/router-selector | Brenton Leanhardt | 2016-04-20 | 8 | -17/+51 |
|\ | | | | | Bug 1328119 - router selector not obeyed | ||||
| * | Translate legacy facts within the oo_openshift_env filter. | Andrew Butcher | 2016-04-20 | 2 | -7/+8 |
| | | |||||
| * | Remove empty facts from nested dictionaries. | Andrew Butcher | 2016-04-20 | 1 | -8/+18 |
| | | |||||
| * | Fix router selector fact migration and match multiple selectors when ↵ | Andrew Butcher | 2016-04-20 | 9 | -8/+31 |
| | | | | | | | | counting nodes. | ||||
* | | Merge pull request #1582 from jdnieto/openshift_metrics | Brenton Leanhardt | 2016-04-20 | 9 | -1/+162 |
|\ \ | | | | | | | added new openshift-metrics service | ||||
| * | | added new openshift-metrics service | Jose David Martin Nieto | 2016-04-20 | 9 | -1/+162 |
| | | | |||||
* | | | Merge pull request #1774 from brenton/specfixes1 | Brenton Leanhardt | 2016-04-20 | 1 | -81/+0 |
|\ \ \ | |_|/ |/| | | Fixing the spec for PR 1734 | ||||
| * | | Fixing the spec for PR 1734 | Brenton Leanhardt | 2016-04-20 | 1 | -81/+0 |
| |/ | |||||
* | | Merge pull request #1588 from sdodson/cluster-dns | Brenton Leanhardt | 2016-04-20 | 24 | -24/+264 |
|\ \ | |/ |/| | Cluster dns provided by dnsmasq | ||||
| * | Add openshift_node_dnsmasq | Scott Dodson | 2016-04-19 | 21 | -19/+239 |
| | | |||||
| * | Promote portal_net to openshift.common, add kube_svc_ip | Scott Dodson | 2016-04-19 | 6 | -8/+28 |
|/ | | | | | Conflicts: roles/openshift_facts/library/openshift_facts.py | ||||
* | Merge pull request #1771 from sdodson/add-inventories | Brenton Leanhardt | 2016-04-19 | 1 | -1/+4 |
|\ | | | | | Add inventories to docs subpackage | ||||
| * | Add example inventories to docs, install docs by default | Scott Dodson | 2016-04-19 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #1739 from ingvagabund/update-inventory-file-for-ose-playbook | Brenton Leanhardt | 2016-04-19 | 3 | -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 Chaloupka | 2016-04-12 | 3 | -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-move | Joel Diaz | 2016-04-19 | 137 | -14190/+0 |
|\ \ \ | |_|/ |/| | | cleanup roles after roles move to openshift-tools | ||||
| * | | cleanup roles after roles move to openshift-tools | Joel Diaz | 2016-04-15 | 137 | -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 Leanhardt | 2016-04-18 | 2 | -2/+7 |
| | | | |||||
* | | | Merge pull request #1763 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use 'openshift3/' as IMAGE_PREFIX for enterprise logging and metrics | ||||
| * | | | IMAGE_PREFIX=openshift3/ for enterprise logging/metrics | Scott Dodson | 2016-04-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1764 from smunilla/BZ1327139 | Brenton Leanhardt | 2016-04-18 | 2 | -14/+38 |
|\ \ \ \ | | | | | | | | | | | a-o-i: Don't assume storage on 1st master | ||||
| * | | | | a-o-i: Don't assume storage on 1st master | Samuel Munilla | 2016-04-18 | 2 | -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/docker1 | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Bug 1320829 - Handle OSE 3.0 installs | ||||
| * | | | Bug 1320829 - Handle OSE 3.0 installs | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Automatic commit of package [openshift-ansible] release [3.0.80-1]. | Troy Dawson | 2016-04-15 | 2 | -2/+12 |
| | | | |||||
* | | | Merge pull request #1746 from brenton/docker1 | Brenton Leanhardt | 2016-04-15 | 10 | -39/+57 |
|\ \ \ | | | | | | | | | The openshift_docker role must set the version facts for containerize… | ||||
| * | | | Support mixed RPM/container installs | Brenton Leanhardt | 2016-04-14 | 2 | -6/+6 |
| | | | | |||||
| * | | | The openshift_docker role must set the version facts for containerized installs | Brenton Leanhardt | 2016-04-14 | 9 | -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-reset | Brenton Leanhardt | 2016-04-15 | 1 | -14/+8 |
|\ \ \ \ | | | | | | | | | | | Refactor docker failed state cleanup | ||||
| * | | | | Refactor docker failed state cleanup | Scott Dodson | 2016-04-15 | 1 | -14/+8 |
| | | | | | |||||
* | | | | | Merge pull request #1752 from sdodson/docker-reset | Brenton Leanhardt | 2016-04-14 | 1 | -3/+15 |
|\| | | | | |/ / / |/| | | | Enable docker before potentially resetting the failure | ||||
| * | | | start it, check for failure, reset it, start again | Scott Dodson | 2016-04-14 | 1 | -8/+11 |
| | | | | |||||
| * | | | Enable docker before potentially resetting the failure | Scott Dodson | 2016-04-14 | 1 | -1/+10 |
| | | | | |||||
* | | | | Merge pull request #1753 from abutcher/mapping-method | Brenton Leanhardt | 2016-04-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix mappingMethod option in identity provider. | ||||
| * | | | Fix mappingMethod option in identity provider. | Andrew Butcher | 2016-04-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1738 from dgoodwin/image-policy-config | Brenton Leanhardt | 2016-04-13 | 6 | -5/+27 |
|\ \ \ | | | | | | | | | Support setting imagePolicyConfig JSON in inventory. | ||||
| * | | | Support setting imagePolicyConfig JSON in inventory. | Devan Goodwin | 2016-04-12 | 6 | -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 Leanhardt | 2016-04-12 | 2 | -2/+17 |
| | | | |||||
* | | | Merge pull request #1744 from smunilla/BZ1323918 | Brenton Leanhardt | 2016-04-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Convert image_tag on masters | ||||
| * | | | Convert image_tag on masters | Samuel Munilla | 2016-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Also convert openshift_image_tag to and rpm versions for masters. | ||||
* | | | | Merge pull request #1718 from brenton/docker1 | Brenton Leanhardt | 2016-04-12 | 17 | -67/+93 |
|\ \ \ \ | | | | | | | | | | | Containerized installs on RHEL were downgrading docker unnecessarily | ||||
| * | | | | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 ↵ | Brenton Leanhardt | 2016-04-12 | 2 | -8/+25 |
| | | | | | | | | | | | | | | | | | | | | containerized env | ||||
| * | | | | Fixing non-HA master restart conditional | Brenton Leanhardt | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fetching the current version a little more carefully | Brenton Leanhardt | 2016-04-12 | 2 | -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 Leanhardt | 2016-04-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | containerized systemd units | ||||
| * | | | | use RestartSec to avoid default rate limit in systemd | Brenton Leanhardt | 2016-04-12 | 8 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Lifted from https://github.com/openshift/origin/pull/8317 | ||||
| * | | | | Installs and upgrades from authenticated registries are not supported for now | Brenton Leanhardt | 2016-04-12 | 1 | -31/+0 |
| | | | | | |||||
| * | | | | Handle cases where the pacemaker variables aren't set | Brenton Leanhardt | 2016-04-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Containerized installs on RHEL were downgrading docker unnecessarily | Brenton Leanhardt | 2016-04-12 | 7 | -34/+58 |
| |/ / / | |||||
* / / / | Automatic commit of package [openshift-ansible] release [3.0.78-1]. | Troy Dawson | 2016-04-12 | 2 | -2/+5 |
|/ / / |