Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into upgrade33 | Devan Goodwin | 2016-07-04 | 16 | -74/+291 |
|\ | |||||
| * | Merge pull request #2116 from skpy/master | Scott Dodson | 2016-07-03 | 1 | -2/+2 |
| |\ | | | | | | | Adds quotes to gpgkey element in byo/config.yml | ||||
| | * | Adds quotes to gpgkey element in byo/config.yml | Scott Merrill | 2016-07-03 | 1 | -2/+2 |
| |/ | | | | | | | | | | | As described in https://github.com/openshift/openshift-ansible/issues/1987#issuecomment-223965843 Hopefully this will help others who are trying install Origin. | ||||
| * | Merge pull request #2112 from sdodson/dnsmasq-additional-config | Scott Dodson | 2016-07-01 | 4 | -3/+25 |
| |\ | | | | | | | Add support for supplying a dnsmasq.conf file | ||||
| | * | Restart dnsmasq encase it was already running | Scott Dodson | 2016-07-01 | 1 | -0/+1 |
| | | | |||||
| | * | Add support for supplying a dnsmasq.conf file | Scott Dodson | 2016-07-01 | 4 | -3/+24 |
| | | | | | | | | | | | | | | | | | | Useful for POC environments where DNS may not actually be setup yet. Make sure you don't define anything that would conflict with the default configuration. You have been warned. | ||||
| * | | Merge pull request #2111 from sdodson/image-stream-sync | Scott Dodson | 2016-07-01 | 2 | -48/+228 |
| |\ \ | | | | | | | | | Update image streams with SCL 2.2 components | ||||
| | * | | Update image streams with SCL 2.2 components | Scott Dodson | 2016-07-01 | 2 | -48/+228 |
| | |/ | |||||
| * | | Merge pull request #2109 from abutcher/rhel-subscribe-version | Scott Dodson | 2016-06-30 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Bump rhel_subscribe default version | ||||
| | * | | Bump rhel subscribe default version. | Andrew Butcher | 2016-06-30 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #2028 from IshentRas/fix_dns | Scott Dodson | 2016-06-30 | 1 | -2/+5 |
| |\ \ | | |/ | |/| | Improve 99-origin-dns.sh | ||||
| | * | - Prevent the script to override n number of the time the same nameserver | IshentRas | 2016-06-13 | 1 | -2/+5 |
| | | | | | | | | | | | | - Prevent the script to echo blank values from IP4_NAMESERVERS variable | ||||
| * | | Merge pull request #2096 from liangxia/master | Scott Dodson | 2016-06-29 | 1 | -8/+8 |
| |\ \ | | | | | | | | | Update conditional expression to save steps | ||||
| | * | | update conditional expression to save steps | liangxia | 2016-06-29 | 1 | -8/+8 |
| | | | | |||||
| * | | | Merge pull request #2097 from sdodson/repoquery | Scott Dodson | 2016-06-29 | 3 | -5/+8 |
| |\ \ \ | | | | | | | | | | | Switch to repoquery, enable plugins for satellite support | ||||
| | * | | | Switch to repoquery, enable plugins for satellite support | Scott Dodson | 2016-06-29 | 3 | -5/+8 |
| | | | | | |||||
| * | | | | Merge pull request #2098 from openshift/revert-2087-speedy_example_copy | Andrew Butcher | 2016-06-29 | 1 | -40/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Revert "Speed up copying OpenShift examples" | ||||
| | * | | | | Revert "Speed up copying OpenShift examples" | Andrew Butcher | 2016-06-29 | 1 | -40/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #2092 from abutcher/issue2084 | Scott Dodson | 2016-06-29 | 1 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Insert iptables rules before DROP or REJECT | ||||
| | * | | | | Check if last rule is DROP when inserting iptables rules. | Andrew Butcher | 2016-06-27 | 1 | -5/+5 |
| | |/ / / | |||||
| * | | | | Merge pull request #2094 from abutcher/etcd-any-errors-fatal | Scott Dodson | 2016-06-29 | 2 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Set any_errors_fatal for etcd facts play | ||||
| | * | | | | Set any_errors_fatal for initialize facts play. | Andrew Butcher | 2016-06-28 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Set any_errors_fatal for etcd facts play. | Andrew Butcher | 2016-06-28 | 1 | -0/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #2095 from georgegoh/master | Scott Dodson | 2016-06-29 | 1 | -0/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | Enable additional 'virt_sandbox_use_nfs' seboolean as per documentation. | ||||
| | * | | | Enable additional 'virt_sandbox_use_nfs' seboolean as per documentation: | George Goh | 2016-06-29 | 1 | -0/+7 |
| |/ / / | | | | | | | | | | | | | https://docs.openshift.org/latest/install_config/persistent_storage/persistent_storage_nfs.html#nfs-selinux | ||||
| * | | | Merge pull request #2087 from tbielawa/speedy_example_copy | Scott Dodson | 2016-06-28 | 1 | -3/+40 |
| |\ \ \ | | |/ / | |/| | | Speed up copying OpenShift examples | ||||
| | * | | Speed up copying OpenShift examples | Tim Bielawa | 2016-06-28 | 1 | -3/+40 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * The `copy` module does not scale to hundreds of files * Replace `copy` with `unarchive` Create a temp dir locally to tar all the OpenShift examples into. Make the dest dir on the remote side, drop examples in place with the `unarchive` module. | ||||
* | | | Fix unsafe bool usage. | Devan Goodwin | 2016-07-04 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typo in example inventories. | Devan Goodwin | 2016-07-04 | 3 | -3/+3 |
| | | | |||||
* | | | Fixes for non-containerized separate etcd hosts. | Devan Goodwin | 2016-06-28 | 3 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into upgrade33 | Devan Goodwin | 2016-06-28 | 16 | -12/+78 |
|\| | | |||||
| * | | Merge pull request #2061 from dgoodwin/docker-110-atomic | Scott Dodson | 2016-06-24 | 1 | -4/+5 |
| |\ \ | | | | | | | | | Block Docker 1.10 upgrade playbook when run against an Atomic OS. | ||||
| | * | | Block Docker 1.10 upgrade playbook when run against an Atomic OS. | Devan Goodwin | 2016-06-17 | 1 | -4/+5 |
| | | | | |||||
| * | | | Merge pull request #2082 from abutcher/upgrade-docker | Scott Dodson | 2016-06-24 | 2 | -1/+13 |
| |\ \ \ | | | | | | | | | | | Don't upgrade docker on non-containerized etcd. | ||||
| | * | | | Don't upgrade docker on non-containerized etcd. | Andrew Butcher | 2016-06-24 | 2 | -1/+13 |
| |/ / / | |||||
| * | | | Merge pull request #2081 from abutcher/BZ1171801 | Scott Dodson | 2016-06-24 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Bug 1348127 - [ansibe-2.1] Can't re-install/upgrade ha Environment 2 masters and 3 etcds | ||||
| | * | | | Access embedded_etcd variable from oo_first_master hostvars. | Andrew Butcher | 2016-06-24 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2073 from dgoodwin/preserve-images-uninstall | Scott Dodson | 2016-06-23 | 2 | -1/+3 |
| |\ \ \ | | | | | | | | | | | Allow flag to uninstall playbook to preserve images. | ||||
| | * | | | Add missing quote in metrics deployer template. | Devan Goodwin | 2016-06-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Allow flag to uninstall playbook to preserve images. | Devan Goodwin | 2016-06-23 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Default is still True, but allow devs to specify False in inventory to avoid having to re-download all images. With upcoming changes the actual images present on the system will have no effect on what gets run. | ||||
| * | | | Merge pull request #1927 from jfcoz/metrics_resolution | Scott Dodson | 2016-06-23 | 3 | -3/+3 |
| |\ \ \ | | | | | | | | | | | add unit in seconds for metrics resolution | ||||
| | * | | | default unit in openshift_facts | jfcoz | 2016-06-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'metrics_resolution' of ↵ | jfcoz | 2016-05-26 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | https://github.com/jfcoz/openshift-ansible into metrics_resolution | ||||
| | | * | | | add unit in seconds for metrics resolution | jfcoz | 2016-05-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | add unit in seconds for metrics resolution | jfcoz | 2016-05-23 | 2 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #2074 from tbielawa/networkmgr_changed | Andrew Butcher | 2016-06-23 | 1 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | | | NetworkManager service never changes | ||||
| | * | | | | NetworkManager service never changes | Tim Bielawa | 2016-06-22 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't ever report the NetworkManager service as changed when preparing to set the 'network_manager_active' fact | ||||
| * | | | | | Merge pull request #2025 from abutcher/global-env | Andrew Butcher | 2016-06-23 | 8 | -0/+58 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Per-service environment variables | ||||
| | * | | | | | Add per-service environment variables. | Andrew Butcher | 2016-06-13 | 8 | -0/+58 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #2075 from sdodson/image-stream-sync | Scott Dodson | 2016-06-23 | 1 | -1/+5 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Add MODE to metrics deployer |