summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2122 from DG-i/masterScott Dodson2016-07-061-1/+1
|\ | | | | fix "hapoxy" typo in loadbalancer playbook
| * fix "hapoxy" typo in loadbalancer playbookMathias Merscher2016-07-061-1/+1
|/ | | | Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
* Merge pull request #1969 from detiber/libvirtJason DeTiberus2016-07-051-0/+5
|\ | | | | Libvirt provider fixes
| * Fix bin/cluster libvirt related errorJason DeTiberus2016-06-011-0/+5
| |
* | Merge pull request #2120 from sdodson/fix_rpmversionScott Dodson2016-07-051-1/+1
|\ \ | | | | | | Fix dnf variant of rpm_versions.sh
| * | Fix dnf variant of rpm_versions.shScott Dodson2016-07-051-1/+1
|/ /
* | Merge pull request #2085 from sdodson/is-mungingScott Dodson2016-07-054-1/+11
|\ \ | | | | | | Make image stream munging optional
| * | Make image stream munging optionalScott Dodson2016-07-054-1/+11
| | |
* | | Merge pull request #2119 from sdodson/masterScott Dodson2016-07-051-0/+5
|\ \ \ | | | | | | | | Add aos-3.3 to tito releasers.conf
| * | | Add aos-3.3 to tito releasers.confScott Dodson2016-07-051-0/+5
|/ / /
* | | Merge pull request #2118 from sdodson/masterScott Dodson2016-07-052-2/+55
|\ \ \ | | | | | | | | Automatic commit of package [openshift-ansible] release [3.3.1-1].
| * | | Automatic commit of package [openshift-ansible] release [3.3.1-1].Scott Dodson2016-07-052-2/+55
|/ / /
* | | Merge pull request #2108 from sdodson/prepare-v13Scott Dodson2016-07-0584-3/+40791
|\ \ \ | | | | | | | | Prepare for v1.3
| * | | Add v1.3 examplesScott Dodson2016-07-0381-0/+40781
| | | |
| * | | Change the examples content sync directoryScott Dodson2016-07-031-1/+1
| | | |
| * | | Add gte_3_3Scott Dodson2016-07-032-2/+9
| | | |
* | | | Merge pull request #2116 from skpy/masterScott Dodson2016-07-031-2/+2
|\ \ \ \ | |/ / / |/| | | Adds quotes to gpgkey element in byo/config.yml
| * | | Adds quotes to gpgkey element in byo/config.ymlScott Merrill2016-07-031-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-configScott Dodson2016-07-014-3/+25
|\ \ \ | | | | | | | | Add support for supplying a dnsmasq.conf file
| * | | Restart dnsmasq encase it was already runningScott Dodson2016-07-011-0/+1
| | | |
| * | | Add support for supplying a dnsmasq.conf fileScott Dodson2016-07-014-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-syncScott Dodson2016-07-012-48/+228
|\ \ \ \ | | | | | | | | | | Update image streams with SCL 2.2 components
| * | | | Update image streams with SCL 2.2 componentsScott Dodson2016-07-012-48/+228
| |/ / /
* | | | Merge pull request #2109 from abutcher/rhel-subscribe-versionScott Dodson2016-06-301-1/+1
|\ \ \ \ | | | | | | | | | | Bump rhel_subscribe default version
| * | | | Bump rhel subscribe default version.Andrew Butcher2016-06-301-1/+1
| |/ / /
* | | | Merge pull request #2028 from IshentRas/fix_dnsScott Dodson2016-06-301-2/+5
|\ \ \ \ | |/ / / |/| | | Improve 99-origin-dns.sh
| * | | - Prevent the script to override n number of the time the same nameserverIshentRas2016-06-131-2/+5
| | | | | | | | | | | | | | | | - Prevent the script to echo blank values from IP4_NAMESERVERS variable
* | | | Merge pull request #2096 from liangxia/masterScott Dodson2016-06-291-8/+8
|\ \ \ \ | | | | | | | | | | Update conditional expression to save steps
| * | | | update conditional expression to save stepsliangxia2016-06-291-8/+8
| | | | |
* | | | | Merge pull request #2097 from sdodson/repoqueryScott Dodson2016-06-293-5/+8
|\ \ \ \ \ | | | | | | | | | | | | Switch to repoquery, enable plugins for satellite support
| * | | | | Switch to repoquery, enable plugins for satellite supportScott Dodson2016-06-293-5/+8
| | | | | |
* | | | | | Merge pull request #2098 from openshift/revert-2087-speedy_example_copyAndrew Butcher2016-06-291-40/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert "Speed up copying OpenShift examples"
| * | | | | | Revert "Speed up copying OpenShift examples"Andrew Butcher2016-06-291-40/+3
|/ / / / / /
* | | | | | Merge pull request #2092 from abutcher/issue2084Scott Dodson2016-06-291-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Insert iptables rules before DROP or REJECT
| * | | | | | Check if last rule is DROP when inserting iptables rules.Andrew Butcher2016-06-271-5/+5
| |/ / / / /
* | | | | | Merge pull request #2094 from abutcher/etcd-any-errors-fatalScott Dodson2016-06-292-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set any_errors_fatal for etcd facts play
| * | | | | | Set any_errors_fatal for initialize facts play.Andrew Butcher2016-06-281-0/+1
| | | | | | |
| * | | | | | Set any_errors_fatal for etcd facts play.Andrew Butcher2016-06-281-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2095 from georgegoh/masterScott Dodson2016-06-291-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Enable additional 'virt_sandbox_use_nfs' seboolean as per documentation.
| * | | | | Enable additional 'virt_sandbox_use_nfs' seboolean as per documentation:George Goh2016-06-291-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_copyScott Dodson2016-06-281-3/+40
|\ \ \ \ \ | |/ / / / |/| | | | Speed up copying OpenShift examples
| * | | | Speed up copying OpenShift examplesTim Bielawa2016-06-281-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.
* | | | Merge pull request #2061 from dgoodwin/docker-110-atomicScott Dodson2016-06-241-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 Goodwin2016-06-171-4/+5
| | | | |
* | | | | Merge pull request #2082 from abutcher/upgrade-dockerScott Dodson2016-06-242-1/+13
|\ \ \ \ \ | | | | | | | | | | | | Don't upgrade docker on non-containerized etcd.
| * | | | | Don't upgrade docker on non-containerized etcd.Andrew Butcher2016-06-242-1/+13
|/ / / / /
* | | | | Merge pull request #2081 from abutcher/BZ1171801Scott Dodson2016-06-241-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 Butcher2016-06-241-1/+1
|/ / / / /
* | | | | Merge pull request #2073 from dgoodwin/preserve-images-uninstallScott Dodson2016-06-232-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Allow flag to uninstall playbook to preserve images.
| * | | | Add missing quote in metrics deployer template.Devan Goodwin2016-06-231-1/+1
| | | | |