summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | |
| * | Allow flag to uninstall playbook to preserve images.Devan Goodwin2016-06-231-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_resolutionScott Dodson2016-06-233-3/+3
|\ \ | | | | | | add unit in seconds for metrics resolution
| * | default unit in openshift_factsjfcoz2016-06-071-1/+1
| | |
| * | Merge branch 'metrics_resolution' of ↵jfcoz2016-05-260-0/+0
| |\ \ | | | | | | | | | | | | https://github.com/jfcoz/openshift-ansible into metrics_resolution
| | * | add unit in seconds for metrics resolutionjfcoz2016-05-201-1/+1
| | | |
| * | | add unit in seconds for metrics resolutionjfcoz2016-05-232-2/+2
| |/ /
* | | Merge pull request #2074 from tbielawa/networkmgr_changedAndrew Butcher2016-06-231-5/+5
|\ \ \ | | | | | | | | NetworkManager service never changes
| * | | NetworkManager service never changesTim Bielawa2016-06-221-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-envAndrew Butcher2016-06-238-0/+58
|\ \ \ \ | | | | | | | | | | Per-service environment variables
| * | | | Add per-service environment variables.Andrew Butcher2016-06-138-0/+58
| | | | |
* | | | | Merge pull request #2075 from sdodson/image-stream-syncScott Dodson2016-06-231-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Add MODE to metrics deployer
| * | | | Add MODE to metrics deployerScott Dodson2016-06-231-1/+5
|/ / / /
* | | | Merge pull request #2070 from sdodson/image-stream-syncScott Dodson2016-06-2213-193/+220
|\ \ \ \ | |_|_|/ |/| | | Image stream sync
| * | | Update the rest of the templatesScott Dodson2016-06-229-130/+119
| | | |
| * | | Update logging and metrics templatesScott Dodson2016-06-224-63/+101
|/ / /
* | | Merge pull request #2055 from sdodson/bz1347209Scott Dodson2016-06-171-7/+8
|\ \ \ | | | | | | | | Stop dumping debug output, re-try startng the node once
| * | | Add 30 second pause before retrying to start the nodeScott Dodson2016-06-171-0/+5
| | | |
| * | | Stop dumping debug output, re-try startng the node onceScott Dodson2016-06-161-8/+4
| | | |
* | | | Merge pull request #1925 from sdodson/disconnected-image-streamsScott Dodson2016-06-177-0/+12
|\ \ \ \ | |/ / / |/| | | If registry_url != registry.access.redhat.com then modify image streams
| * | | If registry_url != registry.access.redhat.com then modify image streamsScott Dodson2016-06-177-0/+12
|/ / /
* | | Merge pull request #2037 from ibotty/docker-current_fixesScott Dodson2016-06-151-1/+1
|\ \ \ | | | | | | | | also volume-mount /etc/sysconfig/docker
| * | | also volume-mount /etc/sysconfig/dockerTobias Florek2016-06-141-1/+1
| | | |
* | | | Merge pull request #2046 from talset/uninstall_indentScott Dodson2016-06-151-5/+5
|\ \ \ \ | | | | | | | | | | Fix uninstall.yml indentation for deamon-reload
| * | | | Fix uninstall.yml indentation for deamon-reloadtalset2016-06-151-5/+5
|/ / / / | | | | | | | | | | | | * command: systemctl daemon-reload need to be at the task level, not in the with_items
* | | | Merge pull request #2041 from dgoodwin/no-proxy-hostnamesScott Dodson2016-06-141-0/+12
|\ \ \ \ | | | | | | | | | | Fix no proxy hostnames during upgrade.