summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.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.Andrew Butcher2016-06-242-1/+13
|/ /
* | Merge pull request #2081 from abutcher/BZ1171801Scott Dodson2016-06-241-1/+1
|\ \
| * | 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
|\ \
| * | 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
|/ /
* | Merge pull request #1927 from jfcoz/metrics_resolutionScott Dodson2016-06-233-3/+3
|\ \
| * | default unit in openshift_factsjfcoz2016-06-071-1/+1
| * | Merge branch 'metrics_resolution' of https://github.com/jfcoz/openshift-ansib...jfcoz2016-05-260-0/+0
| |\ \
| | * | 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 changesTim Bielawa2016-06-221-5/+5
* | | | Merge pull request #2025 from abutcher/global-envAndrew Butcher2016-06-238-0/+58
|\ \ \ \
| * | | | 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 deployerScott Dodson2016-06-231-1/+5
|/ / / /
* | | | Merge pull request #2070 from sdodson/image-stream-syncScott Dodson2016-06-2213-193/+220
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \
| * | | 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 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/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-reloadtalset2016-06-151-5/+5
|/ / / /
* | | | Merge pull request #2041 from dgoodwin/no-proxy-hostnamesScott Dodson2016-06-141-0/+12
|\ \ \ \
| * | | | Fix no proxy hostnames during upgrade.Devan Goodwin2016-06-141-0/+12
| | |/ / | |/| |
* | | | Merge pull request #2038 from dgoodwin/node-dep-startScott Dodson2016-06-141-0/+4
|\ \ \ \
| * | | | Attempt to fix containerized node start failure with Docker 1.10.Devan Goodwin2016-06-141-0/+4
| |/ / /
* | | | Merge pull request #2032 from abutcher/uninstall-groupsScott Dodson2016-06-141-237/+351
|\ \ \ \ | |_|/ / |/| | |
| * | | Separate uninstall plays by group.Andrew Butcher2016-06-131-237/+351
| |/ /
* | | Merge pull request #2020 from dgoodwin/docker-upgrade-servicesScott Dodson2016-06-131-2/+2
|\ \ \
| * | | Fix docker 1.10 upgrade on embedded etcd masters.Devan Goodwin2016-06-101-2/+2
| |/ /
* | | Merge pull request #2021 from dgoodwin/comment-docker-1.10Scott Dodson2016-06-134-32/+21
|\ \ \ | |/ / |/| |
| * | Make a note about Requires: dockerScott Dodson2016-06-101-1/+4
| * | Remove Docker 1.10 requirement temporarily.Devan Goodwin2016-06-103-31/+17
|/ /
* | Merge pull request #2007 from bachp/lowercase-proxy-varsScott Dodson2016-06-092-0/+12
|\ \
| * | Add lower case proxy variablesPascal Bach2016-06-092-0/+12
* | | Merge pull request #2013 from sdodson/masterScott Dodson2016-06-092-2/+20
|\ \ \
| * | | Automatic commit of package [openshift-ansible] release [3.3.0-1].Scott Dodson2016-06-092-2/+20
|/ / /
* | | Merge pull request #2005 from brenton/bz1338726Brenton Leanhardt2016-06-0912-65/+202
|\ \ \
| * \ \ Merge pull request #1 from dgoodwin/docker1.10Brenton Leanhardt2016-06-093-8/+17
| |\ \ \
| | * | | Restore mistakenly reverted code.Devan Goodwin2016-06-093-8/+17
| |/ / /