Commit Graph

32 Commits

Author SHA1 Message Date
Yu-Ju Hong
4cdd00fb9c Upgrade to docker 1.8.2 for Debian Wheezy on GCE 2015-09-11 10:09:59 -07:00
Dawn Chen
1932b48db3 Restore the logic of disable docker upgrade through salt for gce.
Currently it is commented out.
2015-08-11 14:55:58 -07:00
Dawn Chen
3901b225e3 Docker 1.7.1 2015-08-11 14:55:57 -07:00
Brendan Burns
26de8cd6b2 Merge pull request #10601 from marun/docker-pkg-f22
Auto commit by PR queue bot
2015-07-23 22:15:50 -07:00
Vish Kannan
919fded0f8 Merge pull request #10401 from justinsb/workaround_salt_18089
Work around Salt 18089
2015-07-23 16:52:21 -07:00
Victor Marmol
dd37642369 Merge pull request #10488 from justinsb/salt_support_systemd
Salt: support systemd (don't assume Redhat <=> systemd)
2015-07-08 13:43:08 -07:00
Brendan Burns
6d08ade4ce Don't start Docker by default on AWS 2015-07-07 21:57:43 -07:00
Justin Santa Barbara
ad0293e3f3 Salt: Add more dependencies to systemd services
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.

Salt bug: https://github.com/saltstack/salt/issues/16778
2015-07-03 01:40:15 -04:00
Justin Santa Barbara
bcd92c7522 Salt: support systemd (don't assume Redhat <=> systemd)
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
2015-07-03 01:40:15 -04:00
Maru Newby
2da59a2f34 Install 'docker' package for Fedora 22
Fedora < 22 provides docker via the 'docker-io' package, but this
package was renamed to 'docker' as of Fedora 22.  Though the docker
package can be installed manually with 'dnf install docker-io' on F22,
Salt requires the explicit package name or deployment will fail.
2015-06-30 21:36:33 -07:00
Justin Santa Barbara
e29e9f0033 Add explicit dependency of docker pkg on the deb download
Salt ordering continues to surprise me.  I saw them execute
out of order, though I don't know why.  Adding an explicit
dependency to prevent out-of-order execution.
2015-06-28 23:51:12 -04:00
Justin Santa Barbara
ea74bd13b8 Work around Salt 18089
Directly create /etc/sysctl.d/99-salt.conf
2015-06-28 23:50:00 -04:00
Dawn Chen
6ddfa512de Revert "Revert "Fix the race between configuring cbr0 and restarting static pods""
This reverts commit fd0a95dd12.
2015-06-24 11:10:10 -07:00
Piotr Szczesniak
fd0a95dd12 Revert "Fix the race between configuring cbr0 and restarting static pods" 2015-06-24 09:56:49 +02:00
Brendan Burns
a29ade2f33 Disable creation of cbr0, the kubelet does it now.
Conditionalize the docker bridge.
2015-06-22 23:15:29 -07:00
derekwaynecarr
2168cee414 Upgrade to Fedora 21, Docker 1.6, clean-up SDN 2015-06-04 10:59:23 -04:00
Zach Loafman
2b3e52c230 Use built-in ContainerVM Docker version rather than installing lxc-docker 2015-05-04 16:33:00 -07:00
Dawn Chen
59a9030413 Move salt based clusters to Docker 1.5.0 2015-02-26 11:06:53 -08:00
Dawn Chen
c053ec63c5 Move salt based clusters to Docker 1.4.1 2014-12-16 15:54:26 -08:00
Dawn Chen
04b136a7db Move salt based clusters to Docker 1.4.0 2014-12-16 11:58:45 -08:00
Joe Beda
c9acafc98a Move salt based clusters to Docker 1.3.3
Part of #2896
2014-12-12 12:18:07 -08:00
Joe Beda
4a5a69b520 Upgrade docker to 1.3.2. 2014-11-25 14:46:25 -08:00
Joe Beda
d033dfcc2b Load etcd tarball from GCS.
Also fix up comment about how to cache docker debs.
2014-11-07 13:43:07 -08:00
Joe Beda
29455398e6 Get docker deb from GCS.
Also lock to 1.3.0 due to issues in 1.3.1 (docker/docker#8889)
2014-10-31 16:27:00 -07:00
Pieter Noordhuis
918c8e2b96 Limit GCE specific mods to GCE 2014-10-29 12:39:07 -07:00
Joe Beda
9a8807b033 get.docker.com is now the preferred place to get Docker
Update salt configs
2014-10-09 12:31:53 -07:00
Joe Beda
847c87faa8 Fix docker start after minion reboot on GCE/debian
Uncomment docker service state as it should no longer be affected by race bug in docker init.d start script.  Also make sure that the docker service state depends on the cbr state.

Fixes #802
2014-09-03 11:11:28 -07:00
Rajat Chopra
2dd57898d4 add ip per pod across vagrant minions 2014-08-26 11:29:35 -07:00
derekwaynecarr
ba7345d967 Do not always look for latest pkg 2014-08-12 16:10:59 -04:00
Filipe Brandenburger
d7396acced Remove executable permissions of files that do not need it.
In particular, .gitignore, *.go, *.sls and etcd.conf are files that
should not be marked as executable.

Tested: built it with hack/build-go.sh, called all binaries with
  the -version flag to confirm they work.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-08-01 08:22:46 -07:00
derekwaynecarr
69ae2fe4bb Initial vagrant setup and e2e testing support 2014-07-24 16:32:36 -04:00
Joe Beda
894a7e3282 Move everything out of src and reorganize scripts.
Fixed up some scripts to be more robust.  Changed the e2e test setup to use g1-small instances.  Fixed up documentation to reflect the new script locations.  Disabled the "curl | bash" cluster launch as it hasn't been well tested and doesn't include the cloudcfg tool yet.
2014-06-06 21:41:19 -07:00