Skip to content

Commit

Permalink
chore(contrib/coreos): clean up user-data
Browse files Browse the repository at this point in the history
Our user-data has some unnecessary cruft in it:
* docker.service was out-of-date with the default CoreOS copy (and
actually was never really being applied anyhow).
* docker-tcp.socket is no longer used - docker.socket is defined by CoreOS
* fleet.service was out-of-date, and our change was never being applied (
I think the `start` just took affect)

TESTING: Provisioning should work just as it did before
  • Loading branch information
carmstrong committed Jul 29, 2014
1 parent 0cf605b commit 44eb938
Showing 1 changed file with 0 additions and 35 deletions.
35 changes: 0 additions & 35 deletions contrib/coreos/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,10 @@ coreos:
addr: $private_ipv4:4001
peer-addr: $private_ipv4:7001
units:
- name: docker.service
content: |
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.io

[Service]
ExecStartPre=/bin/mount --make-rprivate /
# Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files.
ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://

[Install]
WantedBy=multi-user.target
- name: docker-tcp.socket
command: start
content: |
[Unit]
Description=Docker Socket for Remote API

[Socket]
ListenStream=4243
Service=docker.service
BindIPv6Only=both

[Install]
WantedBy=sockets.target
- name: etcd.service
command: start
- name: fleet.service
command: start
content: |
[Unit]
Description=fleet

[Service]
Environment=FLEET_PUBLIC_IP=$private_ipv4
ExecStart=/usr/bin/fleet
- name: stop-update-engine.service
command: start
content: |
Expand All @@ -56,7 +22,6 @@ coreos:
Type=oneshot
ExecStart=/usr/bin/systemctl stop update-engine.service
ExecStartPost=/usr/bin/systemctl mask update-engine.service

write_files:
- path: /etc/deis-release
content: |
Expand Down

0 comments on commit 44eb938

Please sign in to comment.