| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1784 from brenton/reconcile1 | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
| |\ | | | | | Only add new sccs | ||||
| | * | Only add new sccs | Brenton Leanhardt | 2016-04-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1756 from abhat/configurable_admin_user_pass | Brenton Leanhardt | 2016-04-20 | 3 | -1/+10 |
| |\ \ | |/ |/| | Configurable admin username and passsword for Openshift enterprise in Nuage. | ||||
| | * | Support configurable admin user and password for the enterprise | Aniket Bhat | 2016-04-18 | 3 | -1/+10 |
| | | | | | | | | | Prefix changes for admin and password with nuage_master | ||||
| * | | Merge pull request #1776 from sdodson/image-stream-sync | Brenton Leanhardt | 2016-04-20 | 10 | -170/+339 |
| |\ \ | | | | | | | Image stream sync | ||||
| | * | | Sync latest content | Scott Dodson | 2016-04-19 | 9 | -168/+337 |
| | | | | |||||
| | * | | Use xpaas 1.3.0-1, use enterprise content for metrics | Scott Dodson | 2016-04-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Automatic commit of package [openshift-ansible] release [3.0.82-1]. | Troy Dawson | 2016-04-20 | 2 | -2/+25 |
| | | | | |||||
| * | | | Merge pull request #1758 from dgoodwin/fix-json-vars | Brenton Leanhardt | 2016-04-20 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fix use of JSON inventory vars with raw booleans. | ||||
| | * | | | Fix use of JSON inventory vars with raw booleans. | Devan Goodwin | 2016-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Thought this was fixed in recent patch but somehow backed out a critical change to the isinstance, we need to check for basestring to also have this work with unicode strings. | ||||
| * | | | | Merge pull request #1754 from abutcher/etcd-cert-fixes | Brenton Leanhardt | 2016-04-20 | 17 | -77/+92 |
| |\ \ \ \ | | | | | | | | | | | Bug 1299065: Fix etcd hostname/ip address handling | ||||
| | * | | | | Remove etcd_interface variable. Remove openshift_docker dependency from the ↵ | Andrew Butcher | 2016-04-20 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | etcd role. | ||||
| | * | | | | Use openshift_hostname/openshift_ip values for etcd configuration and ↵ | Andrew Butcher | 2016-04-20 | 16 | -75/+92 |
| | | |/ / | |/| | | | | | | | | | | certificates. | ||||
| * | | | | Merge pull request #1742 from dgoodwin/docker-logging | Brenton Leanhardt | 2016-04-20 | 6 | -6/+20 |
| |\ \ \ \ | | | | | | | | | | | Fixes For Docker Log Options | ||||
| | * | | | | Use a JSON list for docker log options. | Devan Goodwin | 2016-04-20 | 5 | -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 Goodwin | 2016-04-20 | 1 | -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-2 | Brenton Leanhardt | 2016-04-20 | 3 | -4/+5 |
| |\ \ \ \ | | | | | | | | | | | Fix use of older image tag version during upgrade. | ||||
| | * | | | | Fix use of older image tag version during upgrade. | Devan Goodwin | 2016-04-20 | 3 | -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-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 |
| | | | | | |||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |