summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upgrade33Devan Goodwin2016-06-2816-12/+78
|\
| * 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
| |/ / / /
* | | | | More docker upgrade fixes.Devan Goodwin2016-06-274-27/+24
* | | | | Only nuke images when crossing the Docker 1.10 boundary in upgrade.Devan Goodwin2016-06-276-25/+28
* | | | | Fix node/openvswitch containers not restarting after upgrade.Devan Goodwin2016-06-241-1/+1
* | | | | Allow skipping Docker upgrade during OpenShift upgrade.Devan Goodwin2016-06-245-0/+37
* | | | | Refactor 3.2 upgrade to avoid killing nodes without evac.Devan Goodwin2016-06-239-159/+130
* | | | | Update docker upgrade playbook to be more flexible.Devan Goodwin2016-06-232-19/+41
* | | | | Merge branch 'master' into upgrade33Devan Goodwin2016-06-2322-446/+613
|\| | | |
| * | | | 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
| | |/ /
* | | | Add missing defaults file.Devan Goodwin2016-06-221-0/+2
* | | | Use common fact initialization include in upgrade.Devan Goodwin2016-06-211-2/+4