Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 | 14 | -72/+83 |
|\ \ \ | | | | | | | | | 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 | 13 | -70/+83 |
| | |/ | |/| | | | | | | | certificates. | ||||
* | | | Use a JSON list for docker log options. | Devan Goodwin | 2016-04-20 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #1766 from abutcher/router-selector | Brenton Leanhardt | 2016-04-20 | 3 | -9/+20 |
|\ \ \ | | | | | | | | | Bug 1328119 - router selector not obeyed | ||||
| * | | | Translate legacy facts within the oo_openshift_env filter. | Andrew Butcher | 2016-04-20 | 1 | -6/+0 |
| | | | | |||||
| * | | | 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 | 4 | -1/+8 |
| | | | | | | | | | | | | | | | | counting nodes. | ||||
* | | | | Merge pull request #1582 from jdnieto/openshift_metrics | Brenton Leanhardt | 2016-04-20 | 6 | -0/+152 |
|\ \ \ \ | |/ / / |/| | | | added new openshift-metrics service | ||||
| * | | | added new openshift-metrics service | Jose David Martin Nieto | 2016-04-20 | 6 | -0/+152 |
| |/ / | |||||
* | | | Add openshift_node_dnsmasq | Scott Dodson | 2016-04-19 | 15 | -18/+173 |
| | | | |||||
* | | | 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 #1734 from joelddiaz/tools-roles-move | Joel Diaz | 2016-04-19 | 134 | -13659/+0 |
|\ \ | | | | | | | cleanup roles after roles move to openshift-tools | ||||
| * | | cleanup roles after roles move to openshift-tools | Joel Diaz | 2016-04-15 | 134 | -13659/+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 | ||||
* | | | 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 |
| | |/ | |/| | |||||
* / | | Bug 1320829 - Handle OSE 3.0 installs | Brenton Leanhardt | 2016-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1746 from brenton/docker1 | Brenton Leanhardt | 2016-04-15 | 9 | -36/+45 |
|\ \ | | | | | | | 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 | 8 | -34/+43 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Refactor docker failed state cleanup | Scott Dodson | 2016-04-15 | 1 | -14/+8 |
| | | | |||||
* | | | 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 #1738 from dgoodwin/image-policy-config | Brenton Leanhardt | 2016-04-13 | 3 | -5/+15 |
|\ \ | | | | | | | Support setting imagePolicyConfig JSON in inventory. | ||||
| * | | Support setting imagePolicyConfig JSON in inventory. | Devan Goodwin | 2016-04-12 | 3 | -5/+15 |
| |/ | | | | | | | | | | | | | | | | | 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. | ||||
* | | 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. | ||||
* | | | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 ↵ | Brenton Leanhardt | 2016-04-12 | 1 | -8/+11 |
| | | | | | | | | | | | | containerized env | ||||
* | | | Fixing non-HA master restart conditional | Brenton Leanhardt | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | ||||
* | | | Containerized installs on RHEL were downgrading docker unnecessarily | Brenton Leanhardt | 2016-04-12 | 4 | -15/+34 |
|/ / | |||||
* | | Merge pull request #1705 from abutcher/secure-router | Brenton Leanhardt | 2016-04-12 | 10 | -78/+170 |
|\ \ | | | | | | | Add support for creating secure router | ||||
| * | | Add support for creating secure router. | Andrew Butcher | 2016-04-11 | 10 | -78/+170 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move openshift_router to openshift_hosted role which will eventually contain registry, metrics and logging. * Adds option for specifying an openshift_hosted_router_certificate cert and key pair. * Removes dependency on node label variables and retrieves the node list from the API s.t. this role can be applied to any cluster with existing nodes. I've added an openshift_hosted playbook that occurs after node install to account for this. * Infrastructure nodes are selected using openshift_hosted_router_selector which is based on deployment type by default; openshift-enterprise -> "region=infra" and online -> "type=infra". | ||||
* | | | Fix a docker-storage sysconfig bug. | Devan Goodwin | 2016-04-11 | 1 | -4/+3 |
|/ / | |||||
* | | Merge openshift_env hostvars. | Andrew Butcher | 2016-04-08 | 2 | -10/+6 |
| | | |||||
* | | Add openshift_hosted_facts role and remove hosted facts from openshift_common. | Andrew Butcher | 2016-04-08 | 7 | -11/+33 |
|/ | |||||
* | Merge pull request #1728 from brenton/bz1324729 | Brenton Leanhardt | 2016-04-08 | 2 | -8/+8 |
|\ | | | | | Bug 1324729 - Import xPaas image streams failed during 3.2 installation | ||||
| * | Bug 1324729 - Import xPaas image streams failed during 3.2 installation | Brenton Leanhardt | 2016-04-07 | 2 | -8/+8 |
| | | |||||
* | | Merge pull request #1720 from abutcher/fix-docker-install | Brenton Leanhardt | 2016-04-07 | 1 | -2/+2 |
|\ \ | |/ |/| | Test docker_version_result.stdout when determining if docker should be installed/downgraded. | ||||
| * | Test docker_version_result.stdout when determining if docker should be ↵ | Andrew Butcher | 2016-04-06 | 1 | -2/+2 |
| | | | | | | | | installed/downgraded. | ||||
* | | Merge pull request #1719 from kwoodson/oadmrouter | Kenny Woodson | 2016-04-07 | 11 | -82/+1375 |
|\ \ | | | | | | | oadm_router first attempt. | ||||
| * | | First attempt at oadm router module | Kenny Woodson | 2016-04-07 | 11 | -82/+1375 |
| | | | |||||
* | | | Merge pull request #1724 from abutcher/nfs-no-common | Brenton Leanhardt | 2016-04-07 | 2 | -8/+7 |
|\ \ \ | | | | | | | | | Bug 1324371: needn't install atomic-openshift packages on nfs server | ||||
| * | | | Remove openshift_common dep from openshift_storage_nfs | Andrew Butcher | 2016-04-06 | 2 | -8/+7 |
| | | | | |||||
* | | | | Merge pull request #1722 from abutcher/containerized-cloudprovider | Brenton Leanhardt | 2016-04-07 | 4 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Add cloudprovider config dir to docker options. |